Merge version 2.36-7+rpi1 and 2.36-8 to produce 2.36-8+rpi1

diff --cc debian/changelog
index 19c425003eb2d7bf7d65203d853077f78f747a82,d1a1686534ef3a361006c4887f50ad6efce6c244..6051be3c3d08cbac9be36d05a001cca2686e5143
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,32 @@@
- glibc (2.36-7+rpi1) bookworm-staging; urgency=medium
++glibc (2.36-8+rpi1) bookworm-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.35-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 02 Oct 2022 17:46:25 +0000]
 +  * Remove valgrind breaks.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Jan 2023 07:42:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 15 Jan 2023 19:14:43 +0000
++
+ glibc (2.36-8) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/patches/hurd-i386/git-sem_wait_race.diff: Fix sem_wait race.
+ 
+   [ Aurelien Jarno ]
+   * debian/po/de.po: update German debconf templates translation, by Helge
+     Kreutzmann. Closes: #1027782.
+   * debian/local/manpages/po/*: update with debconf-updatepo.
+   * debian/po/ko.po: update Korean debconf templates translation, by Changwoo
+     Ryu.  Closes: #1027986.
+   * debian/po/es.po: update Spanish debconf templates translation, by
+     Camaleón.
+   * debian/po/sk.po: update Slovak debconf templates translation, by Marek
+     Sýkora.
+   * debian/patches/git-updates.diff: update from upstream stable branch.
+   * debian/control.in/main: bump Standards-Version to 4.6.2 (no changes).
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Sat, 07 Jan 2023 12:29:49 +0100
  
  glibc (2.36-7) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 607749e2df79d9aec25b271bed535b72d96e8bfd,eab409eb62a13a35e2938c185b241b1cf69c1d00..c93eee98a80579978414ff0ee6c8f271dd42e75a
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -38,6 -42,8 +38,7 @@@ hurd-i386/git-SOMAXCONN.dif
  hurd-i386/git-sigtimedwait.diff
  hurd-i386/git-getrandom-chroot.diff
  hurd-i386/git-mach-headers-freestanding.diff
 -
+ hurd-i386/git-sem_wait_race.diff
  hurd-i386/local-enable-ldconfig.diff
  hurd-i386/tg-sysvshm.diff
  hurd-i386/tg-thread-cancel.diff