debian/changelog

@@ -34,6 +34,7 @@ glibc (2.30-0experimental0) UNRELEASED; urgency=medium
     version compatibility symbols, now useless.
   * debian/libc0.3.symbols.hurd-i386: Update accordingly.
   * debian/patches/hurd-i386/tg-sysvshm.diff: Fix warning.
+  * debian/patches/hurd-i386/local-versionshack.diff: Remove, now useless.
  -- Adam Conrad <adconrad@0c3.net>  Thu, 29 Aug 2019 01:58:14 -0600

debian/patches/hurd-i386/local-versions-hack.diff

-Oops, these old _DEBIAN_ symbol versions don't play nice with the new upstream
-sorting scripts.  Hack around that for now, and we'll have to rebuild packages
-using these symbols to get rid of the oddly-shaped _DEBIAN_ version.
-
-Index: glibc-2.21/scripts/versionlist.awk
-===================================================================
---- glibc-2.21.orig/scripts/versionlist.awk
-+++ glibc-2.21/scripts/versionlist.awk
-@@ -54,11 +54,11 @@ END {
-     # for the cases we have so far.  e.g. GCC_3.0 is "later than"
-     # all GLIBC_* sets that matter for purposes of Versions files.
- 
--    sort = "sort -u -t. -k 1,1 -k 2n,2n -k 3";
-+    sort = "sed s/_DEBIAN_/.DEBIAN_/ | sort -u -t. -k 1,1 -k 2n,2n -k 3 | sed s/.DEBIAN_/_DEBIAN_/";
-     printf "%s", libs[lib] | sort;
-     close(sort);
- 
--    sort = "sort -u -t. -k 1,1 -k 2n,2n -k 3";
-+    sort = "sed s/_DEBIAN_/.DEBIAN_/ | sort -u -t. -k 1,1 -k 2n,2n -k 3 | sed s/.DEBIAN_/_DEBIAN_/";
-     printf "%s", others_libs[lib] | sort;
-     close(sort);
- 

debian/patches/series.hurd-i386

@@ -5,7 +5,6 @@ hurd-i386/local-clock_gettime_MONOTONIC.diff
 hurd-i386/submitted-AF_LINK.diff
 hurd-i386/unsubmitted-mremap.diff
 hurd-i386/local-no-bootstrap-fs-access.diff
-hurd-i386/local-versions-hack.diff
 hurd-i386/unsubmitted-prof-eintr.diff
 hurd-i386/tg-glibc-2.24-restore-malloc-hook.diff
 hurd-i386/unsubmitted-getaux_at_secure.diff