Merge lp:~radumstoica/ubuntu/quantal/fonts-arphic-uming/font-config-fix into lp:ubuntu/quantal/fonts-arphic-uming

Proposed by RaduStoica on 2012-09-08
Status: Merged
Merged at revision: 6
Proposed branch: lp:~radumstoica/ubuntu/quantal/fonts-arphic-uming/font-config-fix
Merge into: lp:ubuntu/quantal/fonts-arphic-uming
Diff against target: 116 lines (+50/-1)
3 files modified
41-arphic-uming.conf (+31/-1)
64-arphic-uming.conf (+8/-0)
debian/changelog (+11/-0)
To merge this branch: bzr merge lp:~radumstoica/ubuntu/quantal/fonts-arphic-uming/font-config-fix
Reviewer Review Type Date Requested Status
Martin Pitt 2012-09-08 Approve on 2012-09-10
Review via email: mp+123416@code.launchpad.net

Description of the change

Fixed fontconfig warnings - multiple values in test and alias tags are
not allowed.

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Exemplary forwarding to Debian, thanks!

review: Approve
Martin Pitt (pitti) wrote :

Hang on, this doesn't build; it needs to be a proper debian/patches/ patch, I'll fix this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '41-arphic-uming.conf'
2--- 41-arphic-uming.conf 2011-12-11 19:57:38 +0000
3+++ 41-arphic-uming.conf 2012-09-08 13:33:22 +0000
4@@ -7,22 +7,52 @@
5 -->
6 <alias>
7 <family>AR PL ShanHeiSun Uni</family>
8+ <default><family>serif</family></default>
9+ </alias>
10+ <alias>
11 <family>AR PL ShanHeiSun Uni MBE</family>
12+ <default><family>serif</family></default>
13+ </alias>
14+ <alias>
15 <family>AR PL UMing CN</family>
16+ <default><family>serif</family></default>
17+ </alias>
18+ <alias>
19 <family>AR PL UMing HK</family>
20+ <default><family>serif</family></default>
21+ </alias>
22+ <alias>
23 <family>AR PL UMing TW</family>
24+ <default><family>serif</family></default>
25+ </alias>
26+ <alias>
27 <family>AR PL UMing TW MBE</family>
28 <default><family>serif</family></default>
29 </alias>
30 <!--
31 Monospace faces
32 -->
33- <alias>
34+ <alias>
35 <family>AR PL ShanHeiSun Uni</family>
36+ <default><family>monospace</family></default>
37+ </alias>
38+ <alias>
39 <family>AR PL ShanHeiSun Uni MBE</family>
40+ <default><family>monospace</family></default>
41+ </alias>
42+ <alias>
43 <family>AR PL UMing CN</family>
44+ <default><family>monospace</family></default>
45+ </alias>
46+ <alias>
47 <family>AR PL UMing HK</family>
48+ <default><family>monospace</family></default>
49+ </alias>
50+ <alias>
51 <family>AR PL UMing TW</family>
52+ <default><family>monospace</family></default>
53+ </alias>
54+ <alias>
55 <family>AR PL UMing TW MBE</family>
56 <default><family>monospace</family></default>
57 </alias>
58
59=== modified file '64-arphic-uming.conf'
60--- 64-arphic-uming.conf 2011-12-11 19:57:38 +0000
61+++ 64-arphic-uming.conf 2012-09-08 13:33:22 +0000
62@@ -4,6 +4,8 @@
63 <match target="pattern">
64 <test qual="any" name="lang" compare="contains">
65 <string>zh-cn</string>
66+ </test>
67+ <test qual="any" name="lang" compare="contains">
68 <string>zh-sg</string>
69 </test>
70 <test qual="any" name="family">
71@@ -17,6 +19,8 @@
72 <match target="pattern">
73 <test qual="any" name="lang" compare="contains">
74 <string>zh-cn</string>
75+ </test>
76+ <test qual="any" name="lang" compare="contains">
77 <string>zh-sg</string>
78 </test>
79 <test name="family">
80@@ -30,6 +34,8 @@
81 <match target="pattern">
82 <test qual="any" name="lang" compare="contains">
83 <string>zh-hk</string>
84+ </test>
85+ <test qual="any" name="lang" compare="contains">
86 <string>zh-mo</string>
87 </test>
88 <test qual="any" name="family">
89@@ -43,6 +49,8 @@
90 <match target="pattern">
91 <test qual="any" name="lang" compare="contains">
92 <string>zh-hk</string>
93+ </test>
94+ <test qual="any" name="lang" compare="contains">
95 <string>zh-mo</string>
96 </test>
97 <test name="family">
98
99=== modified file 'debian/changelog'
100--- debian/changelog 2012-02-16 16:36:20 +0000
101+++ debian/changelog 2012-09-08 13:33:22 +0000
102@@ -1,3 +1,14 @@
103+fonts-arphic-uming (0.2.20080216.2-4ubuntu1) UNRELEASED; urgency=low
104+
105+ * 41-arphic-uming.conf (LP: #1034928)
106+ - Updated so there are no multiple values in an alias tag
107+ (FontConfig warns these are not supported).
108+ * 64-arphic-uming.conf (LP: #1034928)
109+ - Updated so there are no multiple values in a test tag
110+ (FontConfig warns these are not supported).
111+
112+ -- Radu Stoica <radumstoica@gmail.com> Sat, 08 Sep 2012 16:22:17 +0300
113+
114 fonts-arphic-uming (0.2.20080216.2-4) unstable; urgency=low
115
116 * Team upload.

Subscribers

People subscribed via source and target branches

to all changes: