diff -pruN 0.110-1/debian/changelog 0.111-2/debian/changelog --- 0.110-1/debian/changelog 2018-09-03 16:16:14.000000000 +0000 +++ 0.111-2/debian/changelog 2018-09-11 22:37:01.000000000 +0000 @@ -1,3 +1,18 @@ +fonts-cantarell (0.111-2) unstable; urgency=medium + + * Drop revert-require-new-fontmake-psautohint.patch + * Bump Build-Depends on fontmake to 1.5.1 and psautohint to 1.7 + + -- Jeremy Bicha Tue, 11 Sep 2018 18:37:01 -0400 + +fonts-cantarell (0.111-1) unstable; urgency=medium + + * New upstream version 0.111 + * Modify revert-require-new-fontmake-psautohint.patch: + - Don't pass unrecognized -qq to psautohint (Closes: #908020) + + -- Jeremy Bicha Sat, 08 Sep 2018 08:10:15 -0400 + fonts-cantarell (0.110-1) unstable; urgency=medium * New upstream release diff -pruN 0.110-1/debian/control 0.111-2/debian/control --- 0.110-1/debian/control 2018-09-03 16:16:14.000000000 +0000 +++ 0.111-2/debian/control 2018-09-11 22:37:01.000000000 +0000 @@ -13,8 +13,8 @@ Build-Depends: pkg-config Build-Depends-Indep: appstream, - fontmake, - psautohint + fontmake (>= 1.5.1), + psautohint (>= 1.7) Standards-Version: 4.1.1 Homepage: https://wiki.gnome.org/Projects/CantarellFonts Vcs-Git: https://salsa.debian.org/fonts-team/fonts-cantarell.git diff -pruN 0.110-1/debian/patches/revert-require-new-fontmake-psautohint.patch 0.111-2/debian/patches/revert-require-new-fontmake-psautohint.patch --- 0.110-1/debian/patches/revert-require-new-fontmake-psautohint.patch 2018-09-03 16:16:14.000000000 +0000 +++ 0.111-2/debian/patches/revert-require-new-fontmake-psautohint.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -From: Jeremy Bicha -Date: Mon, 3 Sep 2018 12:07:31 -0400 -Subject: Revert 'Update generator script for new fontmake and psautohint' - -commit cdd983d5503d1c - -We need fontmake >= 1.5.0 and psautohint >= 1.7 ---- - scripts/fm.py | 22 ++++++---------------- - 1 file changed, 6 insertions(+), 16 deletions(-) - -diff --git a/scripts/fm.py b/scripts/fm.py -index cb3b87d..e56d590 100644 ---- a/scripts/fm.py -+++ b/scripts/fm.py -@@ -21,20 +21,10 @@ source = Path(args.font_source).resolve() - output_dir = Path(args.output_dir) - - subprocess.run( -- [ -- args.fontmake, -- "-g", -- source, -- "-i", -- "-o", -- "otf", -- "--verbose", -- "WARNING", -- "--output-dir", -- args.output_dir, -- ] --) -+ [args.fontmake, "-g", source, "-i", "-o", "otf", "--verbose", "WARNING"], -+ cwd=output_dir) - --otfs = output_dir.glob("*.otf") -- --subprocess.run([args.psautohint, *[str(otf) for otf in otfs]]) -+for otf in (output_dir / "instance_otf").glob("*.otf"): -+ subprocess.run([args.psautohint, "-qq", str(otf)]) -+ output_dir.mkdir(exist_ok=True) -+ otf.rename(output_dir / otf.name) diff -pruN 0.110-1/debian/patches/series 0.111-2/debian/patches/series --- 0.110-1/debian/patches/series 2018-09-03 16:16:14.000000000 +0000 +++ 0.111-2/debian/patches/series 2018-09-11 22:37:01.000000000 +0000 @@ -1 +0,0 @@ -revert-require-new-fontmake-psautohint.patch diff -pruN 0.110-1/meson.build 0.111-2/meson.build --- 0.110-1/meson.build 2018-09-02 19:18:39.000000000 +0000 +++ 0.111-2/meson.build 2018-09-04 07:47:28.000000000 +0000 @@ -1,4 +1,4 @@ -project('cantarell-fonts', version : '0.110') +project('cantarell-fonts', version : '0.111') datadir = join_paths(get_option('prefix'), get_option('datadir')) appdatadir = join_paths(datadir, 'metainfo') @@ -22,4 +22,4 @@ endif buildappstream = get_option('buildappstream') if buildappstream == true subdir('appstream') -endif \ No newline at end of file +endif diff -pruN 0.110-1/NEWS 0.111-2/NEWS --- 0.110-1/NEWS 2018-09-02 19:18:39.000000000 +0000 +++ 0.111-2/NEWS 2018-09-04 07:47:28.000000000 +0000 @@ -1,3 +1,7 @@ +0.111 + - Fix the wrongly assigned OS/2 weight class values that e.g. led to Extra Bold + being selected when Bold was requested. + 0.110 - Space everything a little bit tighter. - Scale down whiteCircle and blackCircle by 50%, makes password dots smaller. @@ -7,22 +11,28 @@ - Add draft of Cyrillic (GF Cyrillic Plus set), to be improved. - Equalize advance width of period, comma, colon, semicolon. - Build packages with prebuilt fonts baked in. - - New contributed AppStream metadata translations for Slovakian, Slovenian, - Russian and Chinese (China). + - New contributed AppStream metadata translations for Slovak (Dušan Kazik), + Slovenian (Matej Urbančič), Russian (Stas Solovey) and Chinese China + (Dingzhong Chen). 0.101 - Countless detail updates to various glyphs - - Added contributed AppStream metdata translations for Polish, French, - Indonesian, Galician, Occitan, Chinese (Taiwan), Spanish, Catalan, Croatian, - German, Dutch, Turkish, Serbian, Serbian (Latin), Hungarian, Korean, Czech, - Lithuanian, Danish, Italian, Romanian, Punjabi, Latvian, Swedish, Icelandic, - Greek + - Added contributed AppStream metdata translations for Polish (Piotr Drąg), + French (Claude Paroz), Indonesian (Kukuh Syafaat), Galician (Fran Dieguez), + Occitan (Cédric Valmary), Chinese Taiwan (Cheng-Chia Tseng), Spanish (Daniel + Mustieles), Catalan (Adolfo Jayme), Croatian (gogo), German (Tim Sabsch), + Dutch (Nathan Follens), Turkish (Emin Tufan Çetin), Serbian (Марко Костић), + Serbian Latin (Marko Kostić), Hungarian (Gabor Kelemen), Korean (DaeHyun + Sung), Czech (Marek Černocký), Lithuanian (Aurimas Černius), Danish (Ask + Hjorth Larsen), Italian (Gianvito Cavasoli), Romanian (Daniel Șerbănescu), + Punjabi (A S Alam), Latvian (Rūdolfs Mazurs), Swedish (Anders Jonsson), + Icelandic (Sveinn í Felli), Greek (Efstathios Iosifidis) 0.100 - Redesigned from scratch to interpolate cleanly from thin to extra bold. Currently targets the Google Fonts Latin Core and Pro glyph sets. - - Added contributed AppStream metdata translations for Brazilian Portugese, - Friulian and Finnish. + - Added contributed AppStream metdata translations for Brazilian Portugese + (Rafael Fontenelle), Friulian (Fabio Tomat) and Finnish (Jiri Grönroos). 0.0.25 - Can't remember. diff -pruN 0.110-1/src/Cantarell.glyphs 0.111-2/src/Cantarell.glyphs --- 0.110-1/src/Cantarell.glyphs 2018-09-02 19:18:39.000000000 +0000 +++ 0.111-2/src/Cantarell.glyphs 2018-09-04 07:47:28.000000000 +0000 @@ -33,15 +33,6 @@ name = blueScale; value = 0.0625; }, { -name = Axes; -value = ( -{ -Name = Weight; -Tag = wght; -} -); -}, -{ name = "Disable Last Change"; value = 1; }, @@ -82250,5 +82241,5 @@ tH = "67"; }; }; versionMajor = 0; -versionMinor = 110; +versionMinor = 111; }