Comment 0 for bug 1977561

This is a sync request for gettext 0.21-6.

These were the latest Ubuntu changes:

==> debian/changelog <==
gettext (0.21-4ubuntu4) jammy; urgency=medium

  * debian/patches/git-new-libunistring.patch:
    - cherry pick ah upstream change to fix the build with the new
      libunistring

 -- Sebastien Bacher <email address hidden> Fri, 25 Mar 2022 11:31:07 +0100

gettext (0.21-4ubuntu3) impish; urgency=medium

  * Really fix the merge now

 -- Sebastien Bacher <email address hidden> Fri, 18 Jun 2021 16:29:32 +0200

gettext (0.21-4ubuntu2) impish; urgency=medium

  * Restore part of the delta dropped by error
    move dh-elpa to Build-Depends-Indep (and change it to dh-sequence-elpa,
    thus allowing the removal of explicit "--with elpa" options in
    debian/rules) to fix FTBFS on i386

 -- Sebastien Bacher <email address hidden> Fri, 18 Jun 2021 16:23:57 +0200

gettext (0.21-4ubuntu1) impish; urgency=medium

  * Resynchronize on Debian, remaining change
  * Cherry-pick an upstream commit to fix a FTBFS on armhf (LP: #1910792)
    - debian/patches/05-fix-armhf-ftbfs.patch

 -- Sebastien Bacher <email address hidden> Fri, 18 Jun 2021 16:02:07 +0200
==> End <==

The patches for those changes have been incorporated into the new version
but under different names, although they are equivalent. The map is

  0.21-4ubuntu 0.21.6
  git-new-libunistring.patch -> 05-update-after-gnulib-changed.patch
  05-fix-armhf-ftbfs.patch -> 06-remove-unportable-tests.patch

So Ubuntu changes can be safely overwritten.