Merge version 1:20201107~dfsg-4+rpi1 and 1:20220308~dfsg-1 to produce 1:20220308...

diff --cc debian/changelog
index 5eb8295edb64b282df37c398b5aa5ef5eadc3c51,8670e404269b73ad7d87909a19fd017c6e5039d8..26f8f9919debe895abddb883d611968da16a917f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,34 +1,43 @@@
- fontforge (1:20201107~dfsg-4+rpi1) bullseye-staging; urgency=medium
++fontforge (1:20220308~dfsg-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:20190801~dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 01 Apr 2020 17:53:42 +0000]
 +  * Disable call to SplineFontFree in _MergeFont to work around use after
 +    free bug (see debian bug 948876).
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 22 Jan 2021 05:12:58 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jun 2022 12:15:06 +0000
++
+ fontforge (1:20220308~dfsg-1) unstable; urgency=medium
+ 
+   [ Boyuan Yang ]
+   * debian/control: Drop Rogério Brito from uploaders list. (Closes: #994659)
+ 
+   [ Anthony Fok ]
+   * New upstream version 20220308~dfsg
+   * Add 20120731.b-{6,7,7.1,7.2} changelog entries
+     from Nov 2015 to Apr 2016 that were missing partly due to the failed
+     (forgotten? ignored?) switch from master to debian/sid branch
+   * Add Jonas Smedegaard’s copyright file contributions (which I overlooked)
+     to the 1:20201107~dfsg-2 changelog entry
+   * Refresh Debian patches:
+     - 0001-add-extra-cmake-install-rules.patch: Upstream now installs
+       cidmaps by default (Thanks to Fredrick Brennan for the fix!)
+     - 0004-hurd-PATH_MAX-and-MAXPATHLEN.patch: Finally forwarded upstream
+       at https://github.com/fontforge/fontforge/pull/5046
+     - 0005-hurd-rename-extended-to-avoid-conflict-with-gnumach-dev.patch:
+       Resolve conflicts and rename more "extended" to "extendeddbl"
+   * Replace 0005-hurd-rename-extended-to-avoid-conflict-with-gnumach-dev.patch
+     with a much simpler 0005-hurd-undef-extended-temporarily.patch
+     that "#undef extended" temporarily to circumvent the name collision
+     issue on Hurd.  See https://github.com/fontforge/fontforge/pull/5047
+   * Update fontforge-common.install and fontforge-extras.install
+     - Stop installing app icon in legacy /usr/share/pixmaps location
+       (see upstream commit 6b4ab5a)
+     - cidmaps have been moved from /usr/share/fontforge/ to
+       /usr/share/fontforge/cidmap/ (see commit f97a2cd)
+   * Bump Standards-Version to 4.6.1 (no change)
+ 
+  -- Anthony Fok <foka@debian.org>  Thu, 16 Jun 2022 04:08:43 -0600
  
  fontforge (1:20201107~dfsg-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 116a42d10d0d69b0c84e1ac9a2c06a4ac0d79555,32496c2dc24c196a1af1c2facb2da2afb54cbdec..6de3dcfc37c16c069cc7f49411f736a512e77688
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -2,7 -2,6 +2,7 @@@
  0002-remove-custom-library-search-path.patch
  0003-use-local-libjs-mathjax.patch
  0004-hurd-PATH_MAX-and-MAXPATHLEN.patch
- 0005-hurd-rename-extended-to-avoid-conflict-with-gnumach-dev.patch
+ 0005-hurd-undef-extended-temporarily.patch
  2003_avoid_privacy_breach.patch
  2004-fix-privacy-breach-logo.patch
 +4000-use-after-free-hack.patch

diff --cc fontforge/fvfonts.c
Simple merge