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

diff --cc debian/changelog
index 26f8f9919debe895abddb883d611968da16a917f,4401e3fb942c67a59736359bb4db84be5799c82f..9622518ea543059132f5a93e409a7ef5bf8635d8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,27 +1,36 @@@
- fontforge (1:20220308~dfsg-1+rpi1) bookworm-staging; urgency=medium
++fontforge (1:20230101~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>  Tue, 21 Jun 2022 12:15:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Jan 2023 05:17:12 +0000
++
+ fontforge (1:20230101~dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 20230101~dfsg
+     which incidentally fixes a FTFBS bug with fonts-ocr-a, see #1015092
+     and https://github.com/fontforge/fontforge/issues/5070
+   * Remove build-dependency on libuninameslist-dev, as upstream has switched
+     from libuninameslist to internal nameslist functions since April 2021
+   * Bump Standards-Version to 4.6.2 (no change)
+   * Remove Debian patches that have been merged upstream.
+     Special thanks to Jan Tojnar who contributed an enhanced version of
+     0001-add-extra-cmake-install-rules.patch upstream;
+     see https://github.com/fontforge/fontforge/pull/4941
+   * Drop /usr/share/fontforge/python/simple/ from python3-fontforge.
+     Jeremy Tan explained in https://github.com/fontforge/fontforge/pull/4941:
+         It's a bunch of toy scripts, but they're basic/half-broken and are not
+         easily discoverable, so yeah, no reason to bundle it
+     I must have inadvertently reverted Jonas Smedegaard’s 2020-06-02 fix
+     "stop ship python simple/* scripts: No longer installed upstream"
+     in commit 4a44d9a38025f7b610292cfb1c6c3502cd315158 (Sorry!)
+   * Fix Lintian build-depends-on-obsolete-package warning on libtiff5-dev
+     by build-depending on libtiff-dev instead
+   * Fix miscellaneous errors and warnings detected by Lintian
+ 
+  -- Anthony Fok <foka@debian.org>  Wed, 18 Jan 2023 11:05:41 -0700
  
  fontforge (1:20220308~dfsg-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 6de3dcfc37c16c069cc7f49411f736a512e77688,876b57e46ee2bc9abf12f63e1b076a1a93832c33..68dba9d9298922838e319cfe2a2e5dfe8dcc40a2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,4 +1,5 @@@
- 0001-add-extra-cmake-install-rules.patch
  0002-remove-custom-library-search-path.patch
  0003-use-local-libjs-mathjax.patch
- 0004-hurd-PATH_MAX-and-MAXPATHLEN.patch
- 0005-hurd-undef-extended-temporarily.patch
  2003_avoid_privacy_breach.patch
  2004-fix-privacy-breach-logo.patch
 +4000-use-after-free-hack.patch