Merge version 1.46.0-3+rpi1 and 1.48.0-5 to produce 1.48.0-5+rpi1

diff --cc debian/changelog
index 20db0309bf92f6fdcb1cd7c46a312db9708fe36b,ef6f52704b6632158efbd6e73f8059378362f98c..0c166e5d893eddf325db3e7a5102af41f6dae3ab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,51 +1,58 @@@
- libuv1 (1.46.0-3+rpi1) trixie-staging; urgency=medium
++libuv1 (1.48.0-5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.44.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Mar 2022 17:44:13 +0000]
 +  * Disable testsuite, it seems to fail on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 19 Jan 2024 19:50:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Jun 2024 18:02:22 +0000
++
+ libuv1 (1.48.0-5) unstable; urgency=medium
+ 
+   * add patch to fix thread-priority test (Closes: 1071194)
+ 
+  -- Dominique Dumont <dod@debian.org>  Wed, 19 Jun 2024 18:57:50 +0200
+ 
+ libuv1 (1.48.0-4) unstable; urgency=medium
+ 
+   * control: set Provides to ${t64:Provides} (Closes: #1071034)
+ 
+  -- Dominique Dumont <dod@debian.org>  Wed, 15 May 2024 17:52:58 +0200
+ 
+ libuv1 (1.48.0-3) unstable; urgency=medium
+ 
+   * rename libuv1 package to libuv1t64 (Closes: 1070912)
+ 
+  -- Dominique Dumont <dod@debian.org>  Sun, 12 May 2024 16:33:19 +0200
+ 
+ libuv1 (1.48.0-2) unstable; urgency=medium
+ 
+   [ Jérémy Lal ]
+   * new package libuv1-doc using sphinxdoc. Closes: #1017581.
+   * patch: fix privacy-breach-generic in html doc
+ 
+   [ Dominique Dumont ]
+   * add patch to support loong64.
+     Thanks to Graham Inggs (Closes: #1069214)
+ 
+  -- Dominique Dumont <dod@debian.org>  Sun, 05 May 2024 18:20:25 +0200
+ 
+ libuv1 (1.48.0-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1062694
+ 
+  -- Graham Inggs <ginggs@debian.org>  Wed, 28 Feb 2024 21:01:37 +0000
+ 
+ libuv1 (1.48.0-1) unstable; urgency=medium
+ 
+   [ Dominique Dumont ]
+   * new upstream version:
+     * Fix CVE-2024-24806 (Closes: #1063484)
+   * copyright: update with cme
+   * refreshed patches
+   * rm patch lp2046442-linux-don-t-use-io_uring-...
+   * refreshed symbols file
+ 
+  -- Dominique Dumont <dod@debian.org>  Wed, 14 Feb 2024 18:47:19 +0100
  
  libuv1 (1.46.0-3) unstable; urgency=medium
  

diff --cc debian/rules
index 8945c8720a4e6a1570b1c3ce2f721f8562521946,5d895b6c9572808e3f082d35f61e3553a903152c..3075d3c1dcd602797f2eccabd9fb6b2231711efe
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -29,7 -29,15 +29,15 @@@ export UV_TEST_TIMEOUT_MULTIPLIER = 
  override_dh_auto_test:
  ifeq ($(DEB_BUILD_ARCH_OS),linux)
  # tests fail if they are run in parallel
 -      dh_auto_test --no-parallel
 +      #dh_auto_test --no-parallel
  else
 -      -dh_auto_test
 +      #-dh_auto_test
  endif
+ 
+ execute_before_dh_sphinxdoc:
+ ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+       sphinx-build -D html_theme=default docs/src/ $(CURDIR)/debian/libuv1-doc/usr/share/doc/libuv1/html
+ endif
+ 
+ execute_after_dh_installdocs:
+       rm -f $(CURDIR)/debian/libuv1-doc/usr/share/doc/libuv1-dev/code/.gitignore