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

diff --cc debian/changelog
index a875c373a7214761fefd6c3513b03c422c531a34,b930111ec6f14b4021f290c1e0ba186b8cddc35d..677270abb0c51f81879ff866877cc41bfda7a7c7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,39 +1,48 @@@
- fontforge (1:20230101~dfsg-4+rpi1) trixie-staging; urgency=medium
++fontforge (1:20230101~dfsg-8+rpi1) forky-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, 01 Oct 2024 19:00:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 May 2026 23:09:21 +0000
++
+ fontforge (1:20230101~dfsg-8) unstable; urgency=medium
+ 
+   * Team upload
+   * Drop non-free multiple master font code (See: #665334)
+   * Document Apache-2.0 license in fontforge/othersubrs.c
+ 
+  -- Bastian Germann <bage@debian.org>  Mon, 22 Sep 2025 20:21:04 +0200
+ 
+ fontforge (1:20230101~dfsg-7) unstable; urgency=medium
+ 
+   * Team upload.
+   * libfontforge4 needs a runtime dependency on python3-pkg-resources
+     to work properly (See: #1095130)
+ 
+  -- Alexandre Detiste <tchet@debian.org>  Wed, 17 Sep 2025 14:36:17 +0200
+ 
+ fontforge (1:20230101~dfsg-6) unstable; urgency=medium
+ 
+   * Team upload.
+   * python3-fontforge needs a runtime dependency on python3-pkg-resources
+     to work properly (See: #1095130)
+ 
+  -- Alexandre Detiste <tchet@debian.org>  Wed, 17 Sep 2025 14:03:47 +0200
+ 
+ fontforge (1:20230101~dfsg-5) unstable; urgency=medium
+ 
+   * Team upload.
+   * Remove obsolete debian/README.source
+ 
+   [ Helmut Grohne ]
+   * Fix FTCBFS (Closes: #983666)
+ 
+   [ Jonas Smedegaard ]
+   * remove myself as uploader
+ 
+  -- Alexandre Detiste <tchet@debian.org>  Thu, 04 Sep 2025 20:09:11 +0200
  
  fontforge (1:20230101~dfsg-4) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge