Merge version 8.4.0-2+rpi1 and 8.5.0-2 to produce 8.5.0-2+rpi1

diff --cc debian/changelog
index 9ebd2dffa54cec1ab67a1e393b90e82635c3c75a,6a1a6b8e435c1df168a13b3e0bed8f101cb67849..75e7a15affe27541bd21059799f7b515b30ce252
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,36 @@@
- curl (8.4.0-2+rpi1) trixie-staging; urgency=medium
++curl (8.5.0-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 7.88.1-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 20 May 2023 09:55:44 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Oct 2023 10:28:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 08 Jan 2024 13:14:32 +0000
++
+ curl (8.5.0-2) unstable; urgency=medium
+ 
+   * d/p/openldap_fix_an_LDAP_crash.patch: New patch to fix ldap segfault
+     (closes: #1057855)
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Fri, 29 Dec 2023 15:34:11 -0300
+ 
+ curl (8.5.0-1) unstable; urgency=medium
+ 
+   [ Samuel Henrique ]
+   * New upstream version 8.5.0
+     - Fix CVE-2023-46218: cookie mixed case PSL bypass (closes: #1057646)
+     - Fix CVE-2023-46219: HSTS long file name clears contents (closes: #1057645)
+   * d/rules: Use pkg-info.mk instead of dpkg-parsechangelog for DEB_VERSION
+   * d/p/90_gnutls.patch: Update patch
+   * d/p/dist_add_tests_errorcodes_pl_to_the_tarball.patch: Upstream patch to
+     fix tests
+   * d/p/add_errorcodes_upstream_file.patch: Include missing file from upstream
+     tarball
+ 
+   [ Carlos Henrique Lima Melara ]
+   * d/control: change Maintainer field to curl packaging team
+   * d/README.Debian: add readme to explain curl's team creation
+   * d/control: add myself to Uploaders
+ 
+  -- Samuel Henrique <samueloph@debian.org>  Wed, 06 Dec 2023 20:15:49 +0000
  
  curl (8.4.0-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge