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

Proposed by Andrew Starr-Bochicchio on 2012-09-05
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 on 2012-09-05
Andrew Starr-Bochicchio Pending
Dimitri John Ledkov 2012-09-05 Pending
Ubuntu branches 2012-09-05 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.
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
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: Resubmit
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: Resubmit
Andrew Starr-Bochicchio (andrewsomething) wrote : Posted in a previous version of this proposal

Thanks for catching that. Updated.

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
1=== modified file 'debian/90-fonts-nanum-extra.conf'
2--- debian/90-fonts-nanum-extra.conf 2011-10-13 00:22:03 +0000
3+++ debian/90-fonts-nanum-extra.conf 2012-09-05 00:38:24 +0000
4@@ -5,10 +5,60 @@
5 <match target="scan">
6 <test name="fullname" qual="any" compare="eq">
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">
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">
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">
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">
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">
62 <string>나눔고딕 ExtraBold</string>
63 </test>
64 <edit name="style" mode="assign">
65
66=== modified file 'debian/90-fonts-nanum.conf'
67--- debian/90-fonts-nanum.conf 2011-10-13 00:22:03 +0000
68+++ debian/90-fonts-nanum.conf 2012-09-05 00:38:24 +0000
69@@ -4,8 +4,40 @@
70 <!-- workaround for wrong style and weight -->
71 <match target="scan">
72 <test name="fullname" qual="any" compare="eq">
73- <string>NanumMyeongjoBold</string><string>나눔명조 Bold</string>
74- <string>NanumGothicBold</string><string>나눔고딕 Bold</string>
75+ <string>NanumMyeongjoBold</string>
76+ </test>
77+ <edit name="style" mode="assign">
78+ <string>Bold</string>
79+ </edit>
80+ <edit name="weight" mode="assign">
81+ <const>bold</const>
82+ </edit>
83+ </match>
84+ <match target="scan">
85+ <test name="fullname" qual="any" compare="eq">
86+ <string>나눔명조 Bold</string>
87+ </test>
88+ <edit name="style" mode="assign">
89+ <string>Bold</string>
90+ </edit>
91+ <edit name="weight" mode="assign">
92+ <const>bold</const>
93+ </edit>
94+ </match>
95+ <match target="scan">
96+ <test name="fullname" qual="any" compare="eq">
97+ <string>NanumGothicBold</string>
98+ </test>
99+ <edit name="style" mode="assign">
100+ <string>Bold</string>
101+ </edit>
102+ <edit name="weight" mode="assign">
103+ <const>bold</const>
104+ </edit>
105+ </match>
106+ <match target="scan">
107+ <test name="fullname" qual="any" compare="eq">
108+ <string>나눔고딕 Bold</string>
109 </test>
110 <edit name="style" mode="assign">
111 <string>Bold</string>
112@@ -16,27 +48,60 @@
113 </match>
114 <!-- fallback of the MS fonts -->
115 <alias>
116- <family>Gulim</family><family>굴림</family>
117- <family>Dotum</family><family>돋움</family>
118- <prefer><family>NanumGothic</family></prefer>
119- </alias>
120- <alias>
121- <family>Batang</family><family>바탕</family>
122+ <family>Gulim</family>
123+ <prefer><family>NanumGothic</family></prefer>
124+ </alias>
125+ <alias>
126+ <family>굴림</family>
127+ <prefer><family>NanumGothic</family></prefer>
128+ </alias>
129+ <alias>
130+ <family>Dotum</family>
131+ <prefer><family>NanumGothic</family></prefer>
132+ </alias>
133+ <alias>
134+ <family>돋움</family>
135+ <prefer><family>NanumGothic</family></prefer>
136+ </alias>
137+ <alias>
138+ <family>Batang</family>
139+ <prefer><family>NanumMyeongjo</family></prefer>
140+ </alias>
141+ <alias>
142+ <family>바탕</family>
143 <prefer><family>NanumMyeongjo</family></prefer>
144 </alias>
145 <!-- specify fallbacks for the missing glyphs. -->
146 <match target="pattern">
147 <test name="family" compare="eq">
148- <string>나눔고딕</string><string>NanumGothic</string>
149- </test>
150- <edit name="family" mode="append">
151- <string>UnDotum</string>
152- <string>DejaVu Sans</string>
153- </edit>
154- </match>
155- <match target="pattern">
156- <test name="family" compare="eq">
157- <string>나눔명조</string><string>NanumMyeongjo</string>
158+ <string>나눔고딕</string>
159+ </test>
160+ <edit name="family" mode="append">
161+ <string>UnDotum</string>
162+ <string>DejaVu Sans</string>
163+ </edit>
164+ </match>
165+ <match target="pattern">
166+ <test name="family" compare="eq">
167+ <string>NanumGothic</string>
168+ </test>
169+ <edit name="family" mode="append">
170+ <string>UnDotum</string>
171+ <string>DejaVu Sans</string>
172+ </edit>
173+ </match>
174+ <match target="pattern">
175+ <test name="family" compare="eq">
176+ <string>나눔명조</string>
177+ </test>
178+ <edit name="family" mode="append">
179+ <string>UnBatang</string>
180+ <string>DejaVu Serif</string>
181+ </edit>
182+ </match>
183+ <match target="pattern">
184+ <test name="family" compare="eq">
185+ <string>NanumMyeongjo</string>
186 </test>
187 <edit name="family" mode="append">
188 <string>UnBatang</string>
189
190=== modified file 'debian/changelog'
191--- debian/changelog 2012-06-03 01:41:57 +0000
192+++ debian/changelog 2012-09-05 00:38:24 +0000
193@@ -1,3 +1,12 @@
194+fonts-nanum (3.020-1ubuntu1) quantal; urgency=low
195+
196+ * debian/90-fonts-nanum{-extra}.conf: (LP: #1034928)
197+ - Update so that there are not multiple values within
198+ test tags as Fontconfig warns that this is not supported.
199+ * Add Pre-Depends: dpkg (>= 1.15.6~) for xz compression.
200+
201+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Tue, 04 Sep 2012 15:00:01 -0400
202+
203 fonts-nanum (3.020-1) unstable; urgency=low
204
205 [ Changwoo Ryu ]
206
207=== modified file 'debian/control'
208--- debian/control 2012-06-03 01:41:57 +0000
209+++ debian/control 2012-09-05 00:38:24 +0000
210@@ -1,7 +1,8 @@
211 Source: fonts-nanum
212 Section: fonts
213 Priority: optional
214-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
215+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
216+XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
217 Uploaders: Changwoo Ryu <cwryu@debian.org>
218 Build-Depends: debhelper (>= 9),
219 Standards-Version: 3.9.3
220@@ -11,6 +12,7 @@
221
222 Package: fonts-nanum
223 Architecture: all
224+Pre-Depends: dpkg (>= 1.15.6~)
225 Depends: ${misc:Depends}
226 Conflicts: ttf-nanum (<< 3.010-2)
227 Replaces: ttf-nanum (<< 3.010-2)
228@@ -25,6 +27,7 @@
229
230 Package: fonts-nanum-extra
231 Architecture: all
232+Pre-Depends: dpkg (>= 1.15.6~)
233 Depends: ${misc:Depends}
234 Conflicts: ttf-nanum-extra (<< 3.010-2)
235 Replaces: ttf-nanum (<< 3.010-1), ttf-nanum-extra (<< 3.010-2)
236@@ -40,6 +43,7 @@
237 Package: ttf-nanum
238 Section: oldlibs
239 Priority: extra
240+Pre-Depends: dpkg (>= 1.15.6~)
241 Depends: fonts-nanum, ${misc:Depends}
242 Architecture: all
243 Description: transitional dummy package
244@@ -48,6 +52,7 @@
245 Package: ttf-nanum-extra
246 Section: oldlibs
247 Priority: extra
248+Pre-Depends: dpkg (>= 1.15.6~)
249 Depends: fonts-nanum-extra, ${misc:Depends}
250 Architecture: all
251 Description: transitional dummy package

Subscribers

People subscribed via source and target branches