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

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-unfonts-core/font-config-conf-fix
Merge into: lp:ubuntu/quantal/fonts-unfonts-core
Diff against target: 129 lines (+92/-8)
3 files modified
debian/90-fonts-unfonts-core.conf (+83/-7)
debian/changelog (+8/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu/quantal/fonts-unfonts-core/font-config-conf-fix
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve on 2012-09-05
Ubuntu branches 2012-09-05 Pending
Dimitri John Ledkov 2012-09-05 Pending
Review via email: mp+122777@code.launchpad.net

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

Description of the change

Fix for fonts-unfonts-core'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

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 :

New version 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-unfonts-core.conf'
2--- debian/90-fonts-unfonts-core.conf 2011-10-10 12:37:52 +0000
3+++ debian/90-fonts-unfonts-core.conf 2012-09-05 00:38:23 +0000
4@@ -3,13 +3,89 @@
5 <fontconfig>
6 <match target="font">
7 <test name="family" qual="any">
8- <string>은 바탕</string><string>UnBatang</string>
9- <string>은 돋움</string><string>UnDotum</string>
10- <string>은 궁서</string><string>UnGungseo</string>
11- <string>은 필기</string><string>UnPilgi</string>
12- <string>은 그래픽</string><string>UnGraphic</string>
13- </test>
14-
15+ <string>은 바탕</string>
16+ </test>
17+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
18+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
19+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
20+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
21+ </match>
22+ <match target="font">
23+ <test name="family" qual="any">
24+ <string>UnBatang</string>
25+ </test>
26+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
27+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
28+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
29+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
30+ </match>
31+ <match target="font">
32+ <test name="family" qual="any">
33+ <string>은 돋움</string>
34+ </test>
35+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
36+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
37+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
38+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
39+ </match>
40+ <match target="font">
41+ <test name="family" qual="any">
42+ <string>UnDotum</string>
43+ </test>
44+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
45+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
46+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
47+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
48+ </match>
49+ <match target="font">
50+ <test name="family" qual="any">
51+ <string>은 궁서</string>
52+ </test>
53+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
54+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
55+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
56+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
57+ </match>
58+ <match target="font">
59+ <test name="family" qual="any">
60+ <string>UnGungseo</string>
61+ </test>
62+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
63+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
64+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
65+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
66+ </match>
67+ <match target="font">
68+ <test name="family" qual="any">
69+ <string>은 필기</string>
70+ </test>
71+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
72+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
73+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
74+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
75+ </match>
76+ <match target="font">
77+ <test name="family" qual="any">
78+ <string>UnPilgi</string>
79+ </test>
80+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
81+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
82+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
83+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
84+ </match>
85+ <match target="font">
86+ <test name="family" qual="any">
87+ <string>은 그래픽</string>
88+ </test>
89+ <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
90+ <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
91+ <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
92+ <edit name="hintstyle" mode="assign" binding="strong"><const>hintslight</const></edit>
93+ </match>
94+ <match target="font">
95+ <test name="family" qual="any">
96+ <string>UnGraphic</string>
97+ </test>
98 <edit name="antialias" mode="assign" binding="strong"><bool>true</bool></edit>
99 <edit name="hinting" mode="assign" binding="strong"><bool>false</bool></edit>
100 <edit name="autohint" mode="assign" binding="strong"><bool>true</bool></edit>
101
102=== modified file 'debian/changelog'
103--- debian/changelog 2012-01-15 18:34:21 +0000
104+++ debian/changelog 2012-09-05 00:38:23 +0000
105@@ -1,3 +1,11 @@
106+fonts-unfonts-core (1.0.3.is.1.0.2-080608-5ubuntu2) quantal; urgency=low
107+
108+ * debian/90-fonts-unfonts-core.conf: (LP: #1034928)
109+ - Update so that there are not multiple values within
110+ test tags as Fontconfig warns that this is not supported.
111+
112+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Tue, 04 Sep 2012 16:18:03 -0400
113+
114 fonts-unfonts-core (1.0.3.is.1.0.2-080608-5ubuntu1) precise; urgency=low
115
116 * Merge from Debian unstable (LP: #916847). Remaining Ubuntu changes:
117
118=== modified file 'debian/control'
119--- debian/control 2012-01-15 18:34:21 +0000
120+++ debian/control 2012-09-05 00:38:23 +0000
121@@ -1,7 +1,7 @@
122 Source: fonts-unfonts-core
123 Section: fonts
124 Priority: optional
125-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
126+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
127 XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
128 Uploaders: Changwoo Ryu <cwryu@debian.org>, Hideki Yamane <henrich@debian.org>
129 Build-Depends: debhelper (>= 7.0.50~)

Subscribers

People subscribed via source and target branches