Ubuntu
fonts-nanum package

Merge lp:~andrewsomething/ubuntu/quantal/fonts-nanum/font-config-conf-fix into lp:ubuntu/quantal/fonts-nanum

  1. Quantal (12.10)
  2. font-config-conf-fix
  3. Merge into quantal
Proposed by Andrew Starr-Bochicchio
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp:~andrewsomething/ubuntu/quantal/fonts-nanum/font-config-conf-fix
Merge into: lp:ubuntu/quantal/fonts-nanum
Diff against target: 251 lines (+148/-19)
4 files modified
debian/90-fonts-nanum-extra.conf (+50/-0)
debian/90-fonts-nanum.conf (+83/-18)
debian/changelog (+9/-0)
debian/control (+6/-1)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu/quantal/fonts-nanum/font-config-conf-fix
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Ubuntu branches Pending
Dimitri John Ledkov Pending
Andrew Starr-Bochicchio Pending
Review via email: mp+122778@code.launchpad.net

This proposal supersedes a proposal from 2012-09-04.

Description of the change

Fix for fonts-nanum's fontconfig file. See: #1034928

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote : Posted in a previous version of this proposal

Still produces:

Fontconfig warning: "/etc/fonts/conf.d/90-fonts-nanum-extra.conf", line 13: Having multiple values in <test> isn't supported and may not works as expected

review: Needs Fixing
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote : Posted in a previous version of this proposal

I only had fonts-nanum installed, so I didn't realize there were warnings in fonts-nanum-extra as well. Scratching my own itch (read annoyance at seeing these warnings) here. Branch updated...

review: Needs Resubmitting
Revision history for this message
Dimitri John Ledkov (xnox) wrote : Posted in a previous version of this proposal

Actually this will fail.

Previously it was: OR between each string. (match in any of these cases)
Now you changed it to: AND between each string (match in all of these cases simultaneously, i.e. never)

You need to copy past the match tag around each test as well.

See:
https://bugs.launchpad.net/ubuntu/+source/fonts-unfonts-core/+bug/1034928/comments/23

review: Needs Resubmitting
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote : Posted in a previous version of this proposal

Thanks for catching that. Updated.

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good, ACK. Uploaded to quantal. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/90-fonts-nanum-extra.conf'
--- debian/90-fonts-nanum-extra.conf 2011-10-13 00:22:03 +0000
+++ debian/90-fonts-nanum-extra.conf 2012-09-05 00:38:24 +0000
@@ -5,10 +5,60 @@
5 <match target="scan">5 <match target="scan">
6 <test name="fullname" qual="any" compare="eq">6 <test name="fullname" qual="any" compare="eq">
7 <string>NanumMyeongjo ExtraBold</string>7 <string>NanumMyeongjo ExtraBold</string>
8 </test>
9 <edit name="style" mode="assign">
10 <string>ExtraBold</string>
11 </edit>
12 <edit name="weight" mode="assign">
13 <const>extrabold</const>
14 </edit>
15 </match>
16 <match target="scan">
17 <test name="fullname" qual="any" compare="eq">
8 <string>NanumMyeongjoExtraBold</string>18 <string>NanumMyeongjoExtraBold</string>
19 </test>
20 <edit name="style" mode="assign">
21 <string>ExtraBold</string>
22 </edit>
23 <edit name="weight" mode="assign">
24 <const>extrabold</const>
25 </edit>
26 </match>
27 <match target="scan">
28 <test name="fullname" qual="any" compare="eq">
9 <string>나눔명조 ExtraBold</string>29 <string>나눔명조 ExtraBold</string>
30 </test>
31 <edit name="style" mode="assign">
32 <string>ExtraBold</string>
33 </edit>
34 <edit name="weight" mode="assign">
35 <const>extrabold</const>
36 </edit>
37 </match>
38 <match target="scan">
39 <test name="fullname" qual="any" compare="eq">
10 <string>NanumGothic ExtraBold</string>40 <string>NanumGothic ExtraBold</string>
41 </test>
42 <edit name="style" mode="assign">
43 <string>ExtraBold</string>
44 </edit>
45 <edit name="weight" mode="assign">
46 <const>extrabold</const>
47 </edit>
48 </match>
49 <match target="scan">
50 <test name="fullname" qual="any" compare="eq">
11 <string>NanumGothicExtraBold</string>51 <string>NanumGothicExtraBold</string>
52 </test>
53 <edit name="style" mode="assign">
54 <string>ExtraBold</string>
55 </edit>
56 <edit name="weight" mode="assign">
57 <const>extrabold</const>
58 </edit>
59 </match>
60 <match target="scan">
61 <test name="fullname" qual="any" compare="eq">
12 <string>나눔고딕 ExtraBold</string>62 <string>나눔고딕 ExtraBold</string>
13 </test>63 </test>
14 <edit name="style" mode="assign">64 <edit name="style" mode="assign">
1565
=== modified file 'debian/90-fonts-nanum.conf'
--- debian/90-fonts-nanum.conf 2011-10-13 00:22:03 +0000
+++ debian/90-fonts-nanum.conf 2012-09-05 00:38:24 +0000
@@ -4,8 +4,40 @@
4 <!-- workaround for wrong style and weight -->4 <!-- workaround for wrong style and weight -->
5 <match target="scan">5 <match target="scan">
6 <test name="fullname" qual="any" compare="eq">6 <test name="fullname" qual="any" compare="eq">
7 <string>NanumMyeongjoBold</string><string>나눔명조 Bold</string>7 <string>NanumMyeongjoBold</string>
8 <string>NanumGothicBold</string><string>나눔고딕 Bold</string>8 </test>
9 <edit name="style" mode="assign">
10 <string>Bold</string>
11 </edit>
12 <edit name="weight" mode="assign">
13 <const>bold</const>
14 </edit>
15 </match>
16 <match target="scan">
17 <test name="fullname" qual="any" compare="eq">
18 <string>나눔명조 Bold</string>
19 </test>
20 <edit name="style" mode="assign">
21 <string>Bold</string>
22 </edit>
23 <edit name="weight" mode="assign">
24 <const>bold</const>
25 </edit>
26 </match>
27 <match target="scan">
28 <test name="fullname" qual="any" compare="eq">
29 <string>NanumGothicBold</string>
30 </test>
31 <edit name="style" mode="assign">
32 <string>Bold</string>
33 </edit>
34 <edit name="weight" mode="assign">
35 <const>bold</const>
36 </edit>
37 </match>
38 <match target="scan">
39 <test name="fullname" qual="any" compare="eq">
40 <string>나눔고딕 Bold</string>
9 </test>41 </test>
10 <edit name="style" mode="assign">42 <edit name="style" mode="assign">
11 <string>Bold</string>43 <string>Bold</string>
@@ -16,27 +48,60 @@
16 </match>48 </match>
17 <!-- fallback of the MS fonts -->49 <!-- fallback of the MS fonts -->
18 <alias>50 <alias>
19 <family>Gulim</family><family>굴림</family>51 <family>Gulim</family>
20 <family>Dotum</family><family>돋움</family>52 <prefer><family>NanumGothic</family></prefer>
21 <prefer><family>NanumGothic</family></prefer>53 </alias>
22 </alias>54 <alias>
23 <alias>55 <family>굴림</family>
24 <family>Batang</family><family>바탕</family>56 <prefer><family>NanumGothic</family></prefer>
57 </alias>
58 <alias>
59 <family>Dotum</family>
60 <prefer><family>NanumGothic</family></prefer>
61 </alias>
62 <alias>
63 <family>돋움</family>
64 <prefer><family>NanumGothic</family></prefer>
65 </alias>
66 <alias>
67 <family>Batang</family>
68 <prefer><family>NanumMyeongjo</family></prefer>
69 </alias>
70 <alias>
71 <family>바탕</family>
25 <prefer><family>NanumMyeongjo</family></prefer>72 <prefer><family>NanumMyeongjo</family></prefer>
26 </alias>73 </alias>
27 <!-- specify fallbacks for the missing glyphs. -->74 <!-- specify fallbacks for the missing glyphs. -->
28 <match target="pattern">75 <match target="pattern">
29 <test name="family" compare="eq">76 <test name="family" compare="eq">
30 <string>나눔고딕</string><string>NanumGothic</string>77 <string>나눔고딕</string>
31 </test>78 </test>
32 <edit name="family" mode="append">79 <edit name="family" mode="append">
33 <string>UnDotum</string>80 <string>UnDotum</string>
34 <string>DejaVu Sans</string>81 <string>DejaVu Sans</string>
35 </edit>82 </edit>
36 </match>83 </match>
37 <match target="pattern">84 <match target="pattern">
38 <test name="family" compare="eq">85 <test name="family" compare="eq">
39 <string>나눔명조</string><string>NanumMyeongjo</string>86 <string>NanumGothic</string>
87 </test>
88 <edit name="family" mode="append">
89 <string>UnDotum</string>
90 <string>DejaVu Sans</string>
91 </edit>
92 </match>
93 <match target="pattern">
94 <test name="family" compare="eq">
95 <string>나눔명조</string>
96 </test>
97 <edit name="family" mode="append">
98 <string>UnBatang</string>
99 <string>DejaVu Serif</string>
100 </edit>
101 </match>
102 <match target="pattern">
103 <test name="family" compare="eq">
104 <string>NanumMyeongjo</string>
40 </test>105 </test>
41 <edit name="family" mode="append">106 <edit name="family" mode="append">
42 <string>UnBatang</string>107 <string>UnBatang</string>
43108
=== modified file 'debian/changelog'
--- debian/changelog 2012-06-03 01:41:57 +0000
+++ debian/changelog 2012-09-05 00:38:24 +0000
@@ -1,3 +1,12 @@
1fonts-nanum (3.020-1ubuntu1) quantal; urgency=low
2
3 * debian/90-fonts-nanum{-extra}.conf: (LP: #1034928)
4 - Update so that there are not multiple values within
5 test tags as Fontconfig warns that this is not supported.
6 * Add Pre-Depends: dpkg (>= 1.15.6~) for xz compression.
7
8 -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Tue, 04 Sep 2012 15:00:01 -0400
9
1fonts-nanum (3.020-1) unstable; urgency=low10fonts-nanum (3.020-1) unstable; urgency=low
211
3 [ Changwoo Ryu ]12 [ Changwoo Ryu ]
413
=== modified file 'debian/control'
--- debian/control 2012-06-03 01:41:57 +0000
+++ debian/control 2012-09-05 00:38:24 +0000
@@ -1,7 +1,8 @@
1Source: fonts-nanum1Source: fonts-nanum
2Section: fonts2Section: fonts
3Priority: optional3Priority: optional
4Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
5Uploaders: Changwoo Ryu <cwryu@debian.org>6Uploaders: Changwoo Ryu <cwryu@debian.org>
6Build-Depends: debhelper (>= 9),7Build-Depends: debhelper (>= 9),
7Standards-Version: 3.9.38Standards-Version: 3.9.3
@@ -11,6 +12,7 @@
1112
12Package: fonts-nanum13Package: fonts-nanum
13Architecture: all14Architecture: all
15Pre-Depends: dpkg (>= 1.15.6~)
14Depends: ${misc:Depends}16Depends: ${misc:Depends}
15Conflicts: ttf-nanum (<< 3.010-2)17Conflicts: ttf-nanum (<< 3.010-2)
16Replaces: ttf-nanum (<< 3.010-2)18Replaces: ttf-nanum (<< 3.010-2)
@@ -25,6 +27,7 @@
2527
26Package: fonts-nanum-extra28Package: fonts-nanum-extra
27Architecture: all29Architecture: all
30Pre-Depends: dpkg (>= 1.15.6~)
28Depends: ${misc:Depends}31Depends: ${misc:Depends}
29Conflicts: ttf-nanum-extra (<< 3.010-2)32Conflicts: ttf-nanum-extra (<< 3.010-2)
30Replaces: ttf-nanum (<< 3.010-1), ttf-nanum-extra (<< 3.010-2)33Replaces: ttf-nanum (<< 3.010-1), ttf-nanum-extra (<< 3.010-2)
@@ -40,6 +43,7 @@
40Package: ttf-nanum43Package: ttf-nanum
41Section: oldlibs44Section: oldlibs
42Priority: extra45Priority: extra
46Pre-Depends: dpkg (>= 1.15.6~)
43Depends: fonts-nanum, ${misc:Depends}47Depends: fonts-nanum, ${misc:Depends}
44Architecture: all48Architecture: all
45Description: transitional dummy package49Description: transitional dummy package
@@ -48,6 +52,7 @@
48Package: ttf-nanum-extra52Package: ttf-nanum-extra
49Section: oldlibs53Section: oldlibs
50Priority: extra54Priority: extra
55Pre-Depends: dpkg (>= 1.15.6~)
51Depends: fonts-nanum-extra, ${misc:Depends}56Depends: fonts-nanum-extra, ${misc:Depends}
52Architecture: all57Architecture: all
53Description: transitional dummy package58Description: transitional dummy package

Subscribers

People subscribed via source and target branches