Merge version 2.37-12+rpi2 and 2.37-13 to produce 2.37-13+rpi1

diff --cc debian/changelog
index 83210cb6480719070f93e12328a912f21d75dffa,8ac4ba86516d1b1f3a67388277ecc6ea2897da21..3973f172e82ba649a4a338cf4a91cc277ac72874
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,28 +1,38 @@@
- glibc (2.37-12+rpi2) trixie-staging; urgency=medium
++glibc (2.37-13+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Oct 2023 12:00:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Jan 2024 17:03:00 +0000
 +
- glibc (2.37-12+rpi1) trixie-staging; urgency=medium
+ glibc (2.37-13) unstable; 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.
+   [ Aurelien Jarno ]
+   * debian/rules.d/control.mk: enable build on loong64.  Closes: #1053717.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+   * debian/patches/any/local-tcsetaddr.diff: fix a thinko in handling of
+     CREAD, CSIZE, PARENB bits in tcsetaddr(). Thanks to Ian Abbott for the
+     hint.  Closes: #1050290.
+   * Update Swedish debconf translation, by Martin Bagge.  Closes: #1056957.
+   * debian/local/manpages/getconf.1: fix issues reported py mandoc.  Closes:
+     #1052267.
+ 
+   [ Samuel Thibault ]
+   * debian/patches/hurd-i386/git-statfs_f_ffree.patch: Add missing f_ffree
+     conversion.
+   * debian/patches/hurd-i386/git-send_interrupt.diff: Fix spurious send
+     interrupts.
+   * debian/patches/hurd-i386/git-exec-intr.diff: Fix "invalid destination"
+     errors during ghc builds.
+   * debian/patches/hurd-i386/git-ioctls-bsd.diff: Fix missing BSD macros after
+     including termios.h then ioctl.h
+   * debian/patches/hurd-i386/git-dtable_reauth.diff: Fix restarting
+     reauth_dtable on signal.
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Oct 2023 23:15:41 +0000
+  -- Aurelien Jarno <aurel32@debian.org>  Sun, 03 Dec 2023 14:23:52 +0100
  
  glibc (2.37-12) unstable; urgency=critical
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index f01c44eeb17d344e34c07aef49172d39af003d08,35029e9283e39a2699642b8e0d4a25a080d5c135..1ac9341f4bf4345e437b4bd8e656b152ef07f7db
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -33,6 -38,12 +33,11 @@@ hurd-i386/git-jemalloc2.dif
  hurd-i386/git-error_t.diff
  hurd-i386/git-tls_dtors.diff
  hurd-i386/git-main_stack.diff
 -
+ hurd-i386/git-statfs_f_ffree.patch
+ hurd-i386/git-send_interrupt.diff
+ hurd-i386/git-exec-intr.diff
+ hurd-i386/git-ioctls-bsd.diff
+ hurd-i386/git-dtable_reauth.diff
  hurd-i386/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
  hurd-i386/tg-thread-cancel.diff