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

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-droid/font-config-conf-fix
Merge into: lp:ubuntu/quantal/fonts-droid
Diff against target: 181 lines (+138/-1)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/local/65-droid-sans-fonts.conf (+128/-0)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu/quantal/fonts-droid/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+122779@code.launchpad.net

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

Description of the change

Fix for fonts-droid'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.

7. By Andrew Starr-Bochicchio on 2012-09-05

Fix missing tag.

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/changelog'
2--- debian/changelog 2012-03-28 22:47:51 +0000
3+++ debian/changelog 2012-09-05 00:44:18 +0000
4@@ -1,3 +1,11 @@
5+fonts-droid (20111207+git-1ubuntu1) quantal; urgency=low
6+
7+ * debian/local/65-droid-sans-fonts.conf: (LP: #1034928)
8+ - Update so that there are not multiple values within
9+ test tags as Fontconfig warns that this is not supported.
10+
11+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Tue, 04 Sep 2012 13:53:12 -0400
12+
13 fonts-droid (20111207+git-1) unstable; urgency=low
14
15 * Team upload
16
17=== modified file 'debian/control'
18--- debian/control 2012-03-28 22:47:51 +0000
19+++ debian/control 2012-09-05 00:44:18 +0000
20@@ -1,7 +1,8 @@
21 Source: fonts-droid
22 Section: fonts
23 Priority: optional
24-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
25+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26+XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
27 Uploaders: Simon Ochsenreither <simon@ochsenreither.de>
28 Build-Depends: debhelper (>= 9~)
29 Standards-Version: 3.9.3
30
31=== modified file 'debian/local/65-droid-sans-fonts.conf'
32--- debian/local/65-droid-sans-fonts.conf 2012-03-28 22:47:51 +0000
33+++ debian/local/65-droid-sans-fonts.conf 2012-09-05 00:44:18 +0000
34@@ -96,9 +96,73 @@
35 <match target="scan">
36 <test name="lang" compare="not_eq">
37 <string>zh-cn</string>
38+ </test>
39+ <test name="family">
40+ <string>Droid Sans Japanese</string>
41+ </test>
42+ <edit name="family">
43+ <string>Droid Sans</string>
44+ </edit>
45+ <edit name="fullname">
46+ <string>Droid Sans</string>
47+ </edit>
48+ <edit name="fontversion">
49+ <int>3</int>
50+ </edit>
51+ </match>
52+ <match target="scan">
53+ <test name="lang" compare="not_eq">
54 <string>zh-sg</string>
55+ </test>
56+ <test name="family">
57+ <string>Droid Sans Japanese</string>
58+ </test>
59+ <edit name="family">
60+ <string>Droid Sans</string>
61+ </edit>
62+ <edit name="fullname">
63+ <string>Droid Sans</string>
64+ </edit>
65+ <edit name="fontversion">
66+ <int>3</int>
67+ </edit>
68+ </match>
69+ <match target="scan">
70+ <test name="lang" compare="not_eq">
71 <string>zh-hk</string>
72+ </test>
73+ <test name="family">
74+ <string>Droid Sans Japanese</string>
75+ </test>
76+ <edit name="family">
77+ <string>Droid Sans</string>
78+ </edit>
79+ <edit name="fullname">
80+ <string>Droid Sans</string>
81+ </edit>
82+ <edit name="fontversion">
83+ <int>3</int>
84+ </edit>
85+ </match>
86+ <match target="scan">
87+ <test name="lang" compare="not_eq">
88 <string>zh-tw</string>
89+ </test>
90+ <test name="family">
91+ <string>Droid Sans Japanese</string>
92+ </test>
93+ <edit name="family">
94+ <string>Droid Sans</string>
95+ </edit>
96+ <edit name="fullname">
97+ <string>Droid Sans</string>
98+ </edit>
99+ <edit name="fontversion">
100+ <int>3</int>
101+ </edit>
102+ </match>
103+ <match target="scan">
104+ <test name="lang" compare="not_eq">
105 <string>zh</string>
106 </test>
107 <test name="family">
108@@ -131,9 +195,73 @@
109 <match target="scan">
110 <test name="lang">
111 <string>zh-cn</string>
112+ </test>
113+ <test name="family">
114+ <string>Droid Sans Japanese</string>
115+ </test>
116+ <edit name="family">
117+ <string>Droid Sans</string>
118+ </edit>
119+ <edit name="fullname">
120+ <string>Droid Sans</string>
121+ </edit>
122+ <edit name="fontversion">
123+ <int>1</int>
124+ </edit>
125+ </match>
126+ <match target="scan">
127+ <test name="lang" compare="eq">
128 <string>zh-sg</string>
129+ </test>
130+ <test name="family">
131+ <string>Droid Sans Japanese</string>
132+ </test>
133+ <edit name="family">
134+ <string>Droid Sans</string>
135+ </edit>
136+ <edit name="fullname">
137+ <string>Droid Sans</string>
138+ </edit>
139+ <edit name="fontversion">
140+ <int>1</int>
141+ </edit>
142+ </match>
143+ <match target="scan">
144+ <test name="lang" compare="eq">
145 <string>zh-hk</string>
146+ </test>
147+ <test name="family">
148+ <string>Droid Sans Japanese</string>
149+ </test>
150+ <edit name="family">
151+ <string>Droid Sans</string>
152+ </edit>
153+ <edit name="fullname">
154+ <string>Droid Sans</string>
155+ </edit>
156+ <edit name="fontversion">
157+ <int>1</int>
158+ </edit>
159+ </match>
160+ <match target="scan">
161+ <test name="lang" compare="eq">
162 <string>zh-tw</string>
163+ </test>
164+ <test name="family">
165+ <string>Droid Sans Japanese</string>
166+ </test>
167+ <edit name="family">
168+ <string>Droid Sans</string>
169+ </edit>
170+ <edit name="fullname">
171+ <string>Droid Sans</string>
172+ </edit>
173+ <edit name="fontversion">
174+ <int>1</int>
175+ </edit>
176+ </match>
177+ <match target="scan">
178+ <test name="lang" compare="eq">
179 <string>zh</string>
180 </test>
181 <test name="family">

Subscribers

People subscribed via source and target branches