From: Raspbian automatic forward porter Date: Fri, 22 Jan 2021 05:12:58 +0000 (+0000) Subject: Merge version 1:20201107~dfsg-2+rpi1 and 1:20201107~dfsg-4 to produce 1:20201107... X-Git-Tag: archive/raspbian/1%20201107_dfsg-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=602583752760f97ab9b59f32c47cf001cd677ae1;p=fontforge.git Merge version 1:20201107~dfsg-2+rpi1 and 1:20201107~dfsg-4 to produce 1:20201107~dfsg-4+rpi1 --- 602583752760f97ab9b59f32c47cf001cd677ae1 diff --cc debian/changelog index 5da3cde,25b0327..5eb8295 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,34 +1,43 @@@ - fontforge (1:20201107~dfsg-2+rpi1) bullseye-staging; urgency=medium ++fontforge (1:20201107~dfsg-4+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1:20190801~dfsg-4+rpi1 by Peter Michael Green 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. + - -- Peter Michael Greem Wed, 23 Dec 2020 05:24:44 +0000 ++ -- Raspbian forward porter Fri, 22 Jan 2021 05:12:58 +0000 ++ + fontforge (1:20201107~dfsg-4) unstable; urgency=medium + + * Rename extended to extendeddbl to avoid FTBFS on Hurd. + gnumach-dev 1.8+git20201129 added to /usr/include/i386-gnu/mach/i386/fp_reg.h + a new "extended" field which happens to collide with the custom-defined + "extended" type in FontForge, leading to FTBFS on hurd-i386. + See 0005-hurd-rename-extended-to-avoid-conflict-with-gnumach-dev.patch + * Rename 0004-hurd-compatibility.patch to 0004-hurd-PATH_MAX-and-MAXPATHLEN.patch + + -- Anthony Fok Fri, 15 Jan 2021 08:55:46 -0700 + + fontforge (1:20201107~dfsg-3) unstable; urgency=medium + + [ Helmut Grohne ] + * Reduce Build-Depends via Build-Depends-Indep. (Closes: #977954) + + [ Anthony Fok ] + * debian/control: + - Remove uthash-dev and libxt-dev from build-dependency as they are not + used any more by the build. Thanks to Helmut Grohne for the suggestion. + - Specify that fontforge "Provides: fontforge-nox" (Closes: #976736) + - debian/control: Remove "XS-Python-Version: all" which was for Python 2 + - Bump Standards-Version to 4.5.1 (no change) + * Define PATH_MAX and MAXPATHLEN to fix FTBFS on GNU/Hurd. + See debian/patches/0004-hurd-compatibility.patch (Closes: #877795) + * 2003_avoid_privacy_breach.patch: Fix "more than 2 sections in header" + error as reported by "cme fix dpkg" + * debian/fontforge*.install: Sort lines in alphabetical order, by + "cme fix dpkg" + + -- Anthony Fok Fri, 15 Jan 2021 00:41:32 -0700 fontforge (1:20201107~dfsg-2) unstable; urgency=medium diff --cc debian/patches/series index 550a60c,d09f10a..116a42d --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,6 -1,7 +1,8 @@@ 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-rename-extended-to-avoid-conflict-with-gnumach-dev.patch 2003_avoid_privacy_breach.patch 2004-fix-privacy-breach-logo.patch +4000-use-after-free-hack.patch