Merge version 2.37-15~deb13u1+rpi1 and 2.37-15 to produce 2.37-15+rpi1

diff --cc debian/changelog
index 5dad0e83f455d7378be404e8b93b96cd7a908c26,415cfd82aa3d22b42ac7217f3a4dbbb3bf255b8b..08233bb13a481185c8c23b01ba38669c9704f718
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,3 +1,13 @@@
- glibc (2.37-15~deb13u1+rpi1) trixie-staging; urgency=medium
++glibc (2.37-15+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
 +  [changes brought forward from 2.37-12+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 17 Oct 2023 12:00:24 +0000]
 +  * Remove valgrind conflicts.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 18:25:17 +0000
- 
- glibc (2.37-15~deb13u1) trixie; urgency=medium
- 
-   * Rebuild for trixie.
- 
-  -- Aurelien Jarno <aurel32@debian.org>  Wed, 31 Jan 2024 21:45:37 +0100
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 16 Feb 2024 18:31:38 +0000
 +
  glibc (2.37-15) unstable; urgency=critical
  
    * debian/patches/git-updates.diff: update from upstream stable branch: