diff -pruN 0.2.20080216.2-10/debian/changelog 0.2.20080216.2-11/debian/changelog --- 0.2.20080216.2-10/debian/changelog 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/changelog 2019-11-01 19:52:54.000000000 +0000 @@ -1,8 +1,30 @@ +fonts-arphic-uming (0.2.20080216.2-11) unstable; urgency=medium + + * debian/control: + - Drop Christian Perrier from the uploaders list. (Closes: #927587) + + Bump Standards-Version to 4.4.1. + + Bump debhelper compat to v12. + + Use "Rules-Requires-Root: no". + + Add myself into the uploaders list. + + Update Vcs-* fields and use git packaging repo under Salsa + fonts-team. + * debian/gbp.conf: Dropped, no longer necessary. + * debian/patches: Refresh patches using gbp. + + 64-arphic-uming.conf: Weaken font priorities; Drop modification + of font preference for DejaVu Serif. + Downstream Ubuntu's 65-fonts-arphic-uming.conf was partially + merged into 64-arphic-uming.conf since it incorrectly made + fonts available under sans-serif. + * debian/rules: Use "dh_missing --fail-missing". + * debian/changelog: Remove trailing spaces. + + -- Boyuan Yang Fri, 01 Nov 2019 15:52:54 -0400 + fonts-arphic-uming (0.2.20080216.2-10) unstable; urgency=medium * Team upload. * debian/control - - fix Vcs-Git + - fix Vcs-Git - update Homepage: to use https -- Hideki Yamane Mon, 23 Oct 2017 07:12:29 +0900 @@ -13,7 +35,7 @@ fonts-arphic-uming (0.2.20080216.2-9) un * debian/compat - set 10 * debian/control - - set Build-Depends: debhelper (>= 10) + - set Build-Depends: debhelper (>= 10) - set Standards-Version: 4.1.1 * remove empty debian/watch * update oldstyle debian/gbp.conf @@ -104,20 +126,20 @@ fonts-arphic-uming (0.2.20080216.2-3) un * Team upload. * debian/preinst - - remove debug option, sorry for the mess. + - remove debug option, sorry for the mess. -- Hideki Yamane Wed, 25 Jan 2012 22:18:43 +0900 fonts-arphic-uming (0.2.20080216.2-2) unstable; urgency=medium * Team upload. - * debian/ttf-arphic-uming.defoma-hints + * debian/ttf-arphic-uming.defoma-hints - remove it from source * debian/prerm,postrm - remove prerm and move function to postrm. - check if defoma exists (Closes: #655842) * debian/preinst - - remove duplicate defoma calling + - remove duplicate defoma calling * debian/control,compat - Build-Depends: "debhelper >= 7.0.50~" and set 7 to compat - set Vcs-* fields. @@ -130,7 +152,7 @@ fonts-arphic-uming (0.2.20080216.2-1) un * Team upload [ Arne Goetje ] - * Upstream changes: + * Upstream changes: - rename fontconfig files - improve fontconfig files to detect the language and select the right font @@ -161,7 +183,7 @@ ttf-arphic-uming (0.2.20080216.1-2) unst * Merge from Ubuntu: - 10-fix_bitmap_conf_file patch: 25-ttf-arphic-uming-bitmaps.conf causes wrong glyph rendering on Intrepid. Fixed. Additionally add - 25-ttf-arphic-uming-nobitmaps.conf as embedded bitmaps are enabled by + 25-ttf-arphic-uming-nobitmaps.conf as embedded bitmaps are enabled by default in fontconfig now. However, these two files are only copied to /etc/fonts/conf.avail/ . The user needs to link them to /etc/fonts/conf.d/ manually if (s)he desires. (LP: #272913) @@ -186,7 +208,7 @@ ttf-arphic-uming (0.2.20080216.1-1) unst * use cdbs to build package * remove Provides: ttf-arphic-bsmi00lp and ttf-arphic-gbsn00lp entries Copied from FONTLOG: - * Bug fix: 45 Big5 PUA glyphs and 4 HKSCS PUA glyphs have not been assigned + * Bug fix: 45 Big5 PUA glyphs and 4 HKSCS PUA glyphs have not been assigned codepoints -- FIXED. * Bug fix: the bitmap glyphs got lost due to a fontforge bug. -- FIXED * resized all glyphs back to an em-size of 1024 like they were originally. @@ -198,28 +220,28 @@ ttf-arphic-uming (0.2.20080216.1-1) unst * compile font as TrueType Collection (TTC): contains 4 font flavors (CN, HK, TW, TW MBE) which map to different glyph styles. Currently this is only a proof of concept with only 2 codepoints - (U+4EE4 and U+9AA8) between CN, HK and TW flavors and 13 different glyphs - between the TW and TW MBE flavors. All other glyphs are exactly the same + (U+4EE4 and U+9AA8) between CN, HK and TW flavors and 13 different glyphs + between the TW and TW MBE flavors. All other glyphs are exactly the same in all flavors. * debugged a lot of glyphs which had intersecting splines. - * moved all glyphs from the PUA areas into unencoded space and only map - those to the BMP PUA where it's necessary for roundtrip compatibility - (i.e. the HKSCS PUA references only appear in the HK flavor, Big5 - references in HK, TW and TW MBE, and the GB18030-2000 references in the + * moved all glyphs from the PUA areas into unencoded space and only map + those to the BMP PUA where it's necessary for roundtrip compatibility + (i.e. the HKSCS PUA references only appear in the HK flavor, Big5 + references in HK, TW and TW MBE, and the GB18030-2000 references in the CN flavor. * added all outstanding PUA references for HKSCS to be compatible back to HKSCS in ISO 10646-1:1993 - * Name change: from AR PL ShanHeiSun Uni (MBE) to + * Name change: from AR PL ShanHeiSun Uni (MBE) to AR PL UMing {CN|HK|TW|TW MBE}. - For backwards compatibility alias entries are defined to map - "AR PL ShanHeiSun Uni" to "AR PL UMing HK" and "AR PL ShanHeiSun Uni MBE" + For backwards compatibility alias entries are defined to map + "AR PL ShanHeiSun Uni" to "AR PL UMing HK" and "AR PL ShanHeiSun Uni MBE" to "AR PL UMing TW MBE". * split the fontconfig configuration file into 6 (LP: #175972) (Closes: #457420, #457417) : - * 25-ttf-arphic-uming-render: fixes globaladvance and sets the font to be + * 25-ttf-arphic-uming-render: fixes globaladvance and sets the font to be dual-width * 25-ttf-arphic-uming-bitmaps: enables embedded bitmaps - * 35-ttf-arphic-uming-aliases: alias entries for + * 35-ttf-arphic-uming-aliases: alias entries for "AR PL ShanHeiSun Uni (MBE)" * 41-ttf-arphic-uming.conf: binds font to Serif, Sans and Monospace * 64-ttf-arphic-uming.conf: alias settings for Serif, Sans and Monospace @@ -295,7 +317,7 @@ ttf-arphic-uming (0.1.20060108-1) unstab ttf-arphic-uming (0.1-1) unstable; urgency=low - * Bumped up version for official release. No other changes compared to + * Bumped up version for official release. No other changes compared to 0.1-0.dot.3. -- Arne Goetje Tue, 8 Nov 2005 06:50:28 +0800 @@ -388,8 +410,8 @@ ttf-arphic-uming (0.0.20041205-1) unstab * changed the debian packaging, merged the MBE package into this one. - * completed HKSCS for radicals 030, 060, 109, 148, 160, 164, 169, 170, 171, - 172, 173, 174, 175, 177, 178, 179, 180, 184, 186, 188, 190, 191, 196 + * completed HKSCS for radicals 030, 060, 109, 148, 160, 164, 169, 170, 171, + 172, 173, 174, 175, 177, 178, 179, 180, 184, 186, 188, 190, 191, 196 in Basic CJK. * completed Japanese for radicals 60, 109 in Basic CJK. * completed HKSCS for radical 060 in CJK Ext. B. @@ -510,7 +532,7 @@ ttf-arphic-uming (0.0.20030501-1) unstab * Special thanks to Arphic Technology Co., Ltd. and to the Chinese GNU/Linux Extension Team for their effort in bringing our dream to reality! :-) - * Thanks also to Anthony Fok for packaging the original + * Thanks also to Anthony Fok for packaging the original fonts from Arphic Technology Co., Ltd.. -- Arne Goetje Thu, 1 May 2003 00:00:11 +0800 diff -pruN 0.2.20080216.2-10/debian/compat 0.2.20080216.2-11/debian/compat --- 0.2.20080216.2-10/debian/compat 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -pruN 0.2.20080216.2-10/debian/control 0.2.20080216.2-11/debian/control --- 0.2.20080216.2-10/debian/control 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/control 2019-11-01 18:26:32.000000000 +0000 @@ -1,21 +1,31 @@ Source: fonts-arphic-uming -Build-Depends: debhelper (>= 10) Section: fonts Priority: optional Maintainer: Debian Fonts Task Force -Uploaders: Arne Goetje , Christian Perrier -Standards-Version: 4.1.1 +Uploaders: + Arne Goetje , + Boyuan Yang , +Standards-Version: 4.4.1 +Build-Depends: + debhelper-compat (= 12), +Rules-Requires-Root: no Homepage: https://www.freedesktop.org/wiki/Software/CJKUnifonts -Vcs-Git: https://anonscm.debian.org/git/pkg-fonts/fonts-arphic-uming.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-fonts/fonts-arphic-uming.git +Vcs-Git: https://salsa.debian.org/fonts-team/fonts-arphic-uming.git +Vcs-Browser: https://salsa.debian.org/fonts-team/fonts-arphic-uming Package: fonts-arphic-uming Architecture: all Multi-Arch: foreign -Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} -Depends: debconf | debconf-2.0, ${misc:Depends} -Breaks: ttf-arphic-uming (<< 0.2.20080216.2-1), ttf-arphic-uming-mbe (<< 0.2.20080216.2-1) -Conflicts: fonts-arphic-uming-mbe +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + debconf | debconf-2.0, + ${misc:Depends}, +Breaks: + ttf-arphic-uming (<< 0.2.20080216.2-1), + ttf-arphic-uming-mbe (<< 0.2.20080216.2-1), +Conflicts: + fonts-arphic-uming-mbe, Description: "AR PL UMing" Chinese Unicode TrueType font collection Mingti style "AR PL UMing" is a high-quality Chinese Unicode TrueType font collection (uming.ttc) derieved from the original "AR PL Mingti2L Big5" and diff -pruN 0.2.20080216.2-10/debian/dirs 0.2.20080216.2-11/debian/dirs --- 0.2.20080216.2-10/debian/dirs 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/dirs 2019-11-01 18:25:20.000000000 +0000 @@ -1,3 +1,3 @@ -usr/share/fonts/truetype/arphic etc/fonts/conf.avail etc/fonts/conf.d +usr/share/fonts/truetype/arphic diff -pruN 0.2.20080216.2-10/debian/gbp.conf 0.2.20080216.2-11/debian/gbp.conf --- 0.2.20080216.2-10/debian/gbp.conf 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -[buildpackage] -compression = bzip2 diff -pruN 0.2.20080216.2-10/debian/patches/0002-64-arphic-uming.conf-Weaken-priority-and-remove-modi.patch 0.2.20080216.2-11/debian/patches/0002-64-arphic-uming.conf-Weaken-priority-and-remove-modi.patch --- 0.2.20080216.2-10/debian/patches/0002-64-arphic-uming.conf-Weaken-priority-and-remove-modi.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.2.20080216.2-11/debian/patches/0002-64-arphic-uming.conf-Weaken-priority-and-remove-modi.patch 2019-11-01 19:52:54.000000000 +0000 @@ -0,0 +1,166 @@ +From: Boyuan Yang +Date: Fri, 1 Nov 2019 14:49:40 -0400 +Subject: 64-arphic-uming.conf: Weaken priority and remove modification to + DejaVu Serif + +After Ubuntu 19.04 and Debian 10, both Ubuntu and Debian have decided to +prefer Noto CJK fonts. This adjustment to 64-arphic-uming.conf changes +the strong "prepend" relationship of fonts to "append" so that to make +sure that arphic fonts do not take priority. + +Besides, the modification to the priority of DejaVu Serif are removed +as well to solve the issue as originally raised in +https://bugs.launchpad.net/ubuntu/+source/fonts-arphic-uming/+bug/1834561 . + +Part of downstream Ubuntu's 65-arphic-uming.conf is merged inside to +make uming fonts available for serif and monospace (sans-serif +excluded). + +Signed-off-by: Boyuan Yang +--- + 64-arphic-uming.conf | 90 +++++++++++++++------------------------------------- + 1 file changed, 25 insertions(+), 65 deletions(-) + +diff --git a/64-arphic-uming.conf b/64-arphic-uming.conf +index b20b2ad..ed93b0a 100644 +--- a/64-arphic-uming.conf ++++ b/64-arphic-uming.conf +@@ -1,6 +1,26 @@ + + + ++ ++ ++ serif ++ ++ AR PL UMing CN ++ AR PL UMing HK ++ AR PL UMing TW ++ ++ ++ ++ ++ monospace ++ ++ AR PL UMing CN ++ AR PL UMing HK ++ AR PL UMing TW ++ ++ ++ ++ + + + zh-cn +@@ -8,7 +28,7 @@ + + serif + +- ++ + AR PL UMing CN + + +@@ -20,32 +40,8 @@ + + serif + +- +- AR PL UMing CN +- +- +- +- +- +- zh-cn +- +- +- AR PL UMing CN +- +- +- DejaVu Serif +- +- +- +- +- +- zh-sg +- +- ++ + AR PL UMing CN +- +- +- DejaVu Serif + + + +@@ -56,7 +52,7 @@ + + serif + +- ++ + AR PL UMing HK + + +@@ -68,35 +64,11 @@ + + serif + +- ++ + AR PL UMing HK + + + +- +- +- zh-hk +- +- +- AR PL UMing HK +- +- +- DejaVu Serif +- +- +- +- +- +- zh-mo +- +- +- AR PL UMing HK +- +- +- DejaVu Serif +- +- +- + + + zh-tw +@@ -104,21 +76,9 @@ + + serif + +- ++ + AR PL UMing TW + + + +- +- +- zh-tw +- +- +- AR PL UMing TW +- +- +- DejaVu Serif +- +- +- + diff -pruN 0.2.20080216.2-10/debian/patches/30-fix-fontconfig-syntax.patch 0.2.20080216.2-11/debian/patches/30-fix-fontconfig-syntax.patch --- 0.2.20080216.2-10/debian/patches/30-fix-fontconfig-syntax.patch 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/patches/30-fix-fontconfig-syntax.patch 2019-11-01 19:52:54.000000000 +0000 @@ -1,9 +1,89 @@ -Description: Use correct fontconfig syntax for disjunction and don't include multiple elements in test/alias -Author: Iain Lane +From: Iain Lane +Date: Wed, 30 Oct 2013 22:17:18 +0100 +Subject: Use correct fontconfig syntax for disjunction and don't include + multiple elements in test/alias + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687043 +--- + 25-arphic-uming-bitmaps.conf | 44 ++++++++++++++++++++++++++++++++++++++++++-- + 41-arphic-uming.conf | 32 +++++++++++++++++++++++++++++++- + 64-arphic-uming.conf | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 117 insertions(+), 3 deletions(-) -Index: b/41-arphic-uming.conf -=================================================================== +diff --git a/25-arphic-uming-bitmaps.conf b/25-arphic-uming-bitmaps.conf +index c4e1da4..93d96c2 100644 +--- a/25-arphic-uming-bitmaps.conf ++++ b/25-arphic-uming-bitmaps.conf +@@ -5,25 +5,65 @@ + + + AR PL UMing CN ++ ++ false ++ true ++ false ++ ++ ++ + AR PL UMing HK ++ ++ false ++ true ++ false ++ ++ ++ + AR PL UMing TW ++ ++ false ++ true ++ false ++ ++ ++ + AR PL UMing TW MBE + + false + true + false + +- + + + AR PL UMing CN ++ ++ 17 ++ true ++ true ++ ++ ++ + AR PL UMing HK ++ ++ 17 ++ true ++ true ++ ++ ++ + AR PL UMing TW ++ ++ 17 ++ true ++ true ++ ++ ++ + AR PL UMing TW MBE + + 17 + true + true + +- + +diff --git a/41-arphic-uming.conf b/41-arphic-uming.conf +index 7e2f12b..4f91a4d 100644 --- a/41-arphic-uming.conf +++ b/41-arphic-uming.conf @@ -7,22 +7,52 @@ @@ -60,8 +140,8 @@ Index: b/41-arphic-uming.conf AR PL UMing TW MBE monospace -Index: b/64-arphic-uming.conf -=================================================================== +diff --git a/64-arphic-uming.conf b/64-arphic-uming.conf +index dd3ec7e..b20b2ad 100644 --- a/64-arphic-uming.conf +++ b/64-arphic-uming.conf @@ -4,6 +4,17 @@ @@ -136,75 +216,3 @@ Index: b/64-arphic-uming.conf zh-mo -Index: b/25-arphic-uming-bitmaps.conf -=================================================================== ---- a/25-arphic-uming-bitmaps.conf -+++ b/25-arphic-uming-bitmaps.conf -@@ -5,25 +5,65 @@ - - - AR PL UMing CN -+ -+ false -+ true -+ false -+ -+ -+ - AR PL UMing HK -+ -+ false -+ true -+ false -+ -+ -+ - AR PL UMing TW -+ -+ false -+ true -+ false -+ -+ -+ - AR PL UMing TW MBE - - false - true - false - -- - - - AR PL UMing CN -+ -+ 17 -+ true -+ true -+ -+ -+ - AR PL UMing HK -+ -+ 17 -+ true -+ true -+ -+ -+ - AR PL UMing TW -+ -+ 17 -+ true -+ true -+ -+ -+ - AR PL UMing TW MBE - - 17 - true - true - -- - diff -pruN 0.2.20080216.2-10/debian/patches/series 0.2.20080216.2-11/debian/patches/series --- 0.2.20080216.2-10/debian/patches/series 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/patches/series 2019-11-01 19:52:54.000000000 +0000 @@ -1,3 +1,2 @@ -# 10-fix_bitmaps_conf_file.patch -# 20-avoid-multiple-values-in-config-files.patch 30-fix-fontconfig-syntax.patch +0002-64-arphic-uming.conf-Weaken-priority-and-remove-modi.patch diff -pruN 0.2.20080216.2-10/debian/rules 0.2.20080216.2-11/debian/rules --- 0.2.20080216.2-10/debian/rules 2017-10-22 22:12:29.000000000 +0000 +++ 0.2.20080216.2-11/debian/rules 2019-11-01 19:03:09.000000000 +0000 @@ -9,3 +9,6 @@ override_dh_installdocs: override_dh_installchangelogs: dh_installchangelogs -p fonts-arphic-uming FONTLOG + +override_dh_missing: + dh_missing --fail-missing