Merge version 2.30-4+rpi1 and 2.30-7 to produce 2.30-7+rpi1

diff --cc debian/changelog
index 46fc7928dd2834a52de3ec609a5d0857a7719a91,161feb300cdeecd19c13a868d1f51fc24d5577c1..c152bbb212f1d3cb288984833a797e2145970a13
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,54 +1,67 @@@
- glibc (2.30-4+rpi1) bullseye-staging; urgency=medium
++glibc (2.30-7+rpi1) bullseye-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 introduced in 2.29-9+rpi1 by Peter Michale Green]
 +  * Change mode on scripts/check-obsolete-constructs.py to 644, 
 +    dgit does not like mode 755 files created by patches and the
 +    script does not seem to be used for anything in the Debian
 +    package.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Apr 2020 12:05:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 May 2020 14:43:31 +0000
++
+ glibc (2.30-7) unstable; urgency=medium
+ 
+   * debian/debhelper.in/libc.postinst: re-add /etc/ld.so.nohwcapc code.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 05 May 2020 20:12:38 +0200
+ 
+ glibc (2.30-6) unstable; urgency=medium
+ 
+   * debian/sysdeps/s390x.mk: do not set libc_rtlddir, it is set to the
+     default.
+   * debian/rules.d/debhelper.mk: only create the dynamic linker in the udeb
+     if it doesn't already exist.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 05 May 2020 12:32:42 +0200
+ 
+ glibc (2.30-5) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * debian/patches/hurd-i386/git-trunc-times.diff: New patch to fix updating
+     mtime/ctime on O_TRUNC.  Closes: #955270.
+   * debian/control: Drop dependency on libihash-dev, not used any more by htl.
+   * debian/sysdeps/hurd.mk: Try to symlink mach/hurd headers from multiarch
+     directory when they are there.
+ 
+   [ Aurelien Jarno ]
+   * debian/rules: Add -fdebug-prefix-map= to CFLAGS to improve
+     reproducibility.
+   * debian/control.in/libc: Make libcX-dev declare a Breaks against python3.7
+     (<< 3.7.7-1+b1) and python3.8 (<< 3.8.2-1+b1) due to #955474.
+   * debian/rules.d/debhelper.mk: install the dynamic loader symlink in the
+     udeb package.
+   * debian/control: conflict against libgcc-X-dev versions that might need the
+     __glibc_has_include macro.
+   * debian/patches/any/local-revert-glibc_has_include.diff: drop patch,
+     obsolete.
+   * debian/control.in/libc: add a Provides: libc6-dbgsym to the libc6-dbg
+     package.  Closes: #953654.
+   * debian/control.in/libc: qualify the libselinux-dev build-depends with
+     <!stage2>.
+   * debian/debhelper.in/libc.postinst: drop the code removing
+     /etc/ld.so.hwcappkgs, it's not needed anymore since Squeeze.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fixes data race in setting function descriptor during lazy binding on
+       hppa. Closes: #941174.
+     - debian/patches/any/local-tst-system-disable-shell-tests.diff: obsolete.
+ 
+   [ Helmut Grohne ]
+   * Refactor generation of multilib include symlinks. (Closes: #958674).
+   * Initial, minimal support for DPKG_ROOT. (Closes: #910685).
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Mon, 04 May 2020 23:39:18 +0200
  
  glibc (2.30-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge