Ubuntu
fonts-arphic-uming package

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

  1. Quantal (12.10)
  2. font-config-fix
  3. Merge into quantal
Proposed by RaduStoica
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 Approve
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.
Revision history for this message
Martin Pitt (pitti) wrote :

Exemplary forwarding to Debian, thanks!

review: Approve
Revision history for this message
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
=== modified file '41-arphic-uming.conf'
--- 41-arphic-uming.conf 2011-12-11 19:57:38 +0000
+++ 41-arphic-uming.conf 2012-09-08 13:33:22 +0000
@@ -7,22 +7,52 @@
7 -->7 -->
8 <alias>8 <alias>
9 <family>AR PL ShanHeiSun Uni</family>9 <family>AR PL ShanHeiSun Uni</family>
10 <default><family>serif</family></default>
11 </alias>
12 <alias>
10 <family>AR PL ShanHeiSun Uni MBE</family>13 <family>AR PL ShanHeiSun Uni MBE</family>
14 <default><family>serif</family></default>
15 </alias>
16 <alias>
11 <family>AR PL UMing CN</family>17 <family>AR PL UMing CN</family>
18 <default><family>serif</family></default>
19 </alias>
20 <alias>
12 <family>AR PL UMing HK</family>21 <family>AR PL UMing HK</family>
22 <default><family>serif</family></default>
23 </alias>
24 <alias>
13 <family>AR PL UMing TW</family>25 <family>AR PL UMing TW</family>
26 <default><family>serif</family></default>
27 </alias>
28 <alias>
14 <family>AR PL UMing TW MBE</family>29 <family>AR PL UMing TW MBE</family>
15 <default><family>serif</family></default>30 <default><family>serif</family></default>
16 </alias>31 </alias>
17<!--32<!--
18 Monospace faces33 Monospace faces
19 -->34 -->
20 <alias>35 <alias>
21 <family>AR PL ShanHeiSun Uni</family>36 <family>AR PL ShanHeiSun Uni</family>
37 <default><family>monospace</family></default>
38 </alias>
39 <alias>
22 <family>AR PL ShanHeiSun Uni MBE</family>40 <family>AR PL ShanHeiSun Uni MBE</family>
41 <default><family>monospace</family></default>
42 </alias>
43 <alias>
23 <family>AR PL UMing CN</family>44 <family>AR PL UMing CN</family>
45 <default><family>monospace</family></default>
46 </alias>
47 <alias>
24 <family>AR PL UMing HK</family>48 <family>AR PL UMing HK</family>
49 <default><family>monospace</family></default>
50 </alias>
51 <alias>
25 <family>AR PL UMing TW</family>52 <family>AR PL UMing TW</family>
53 <default><family>monospace</family></default>
54 </alias>
55 <alias>
26 <family>AR PL UMing TW MBE</family>56 <family>AR PL UMing TW MBE</family>
27 <default><family>monospace</family></default>57 <default><family>monospace</family></default>
28 </alias>58 </alias>
2959
=== modified file '64-arphic-uming.conf'
--- 64-arphic-uming.conf 2011-12-11 19:57:38 +0000
+++ 64-arphic-uming.conf 2012-09-08 13:33:22 +0000
@@ -4,6 +4,8 @@
4 <match target="pattern">4 <match target="pattern">
5 <test qual="any" name="lang" compare="contains">5 <test qual="any" name="lang" compare="contains">
6 <string>zh-cn</string>6 <string>zh-cn</string>
7 </test>
8 <test qual="any" name="lang" compare="contains">
7 <string>zh-sg</string>9 <string>zh-sg</string>
8 </test>10 </test>
9 <test qual="any" name="family">11 <test qual="any" name="family">
@@ -17,6 +19,8 @@
17 <match target="pattern">19 <match target="pattern">
18 <test qual="any" name="lang" compare="contains">20 <test qual="any" name="lang" compare="contains">
19 <string>zh-cn</string>21 <string>zh-cn</string>
22 </test>
23 <test qual="any" name="lang" compare="contains">
20 <string>zh-sg</string>24 <string>zh-sg</string>
21 </test>25 </test>
22 <test name="family">26 <test name="family">
@@ -30,6 +34,8 @@
30 <match target="pattern">34 <match target="pattern">
31 <test qual="any" name="lang" compare="contains">35 <test qual="any" name="lang" compare="contains">
32 <string>zh-hk</string>36 <string>zh-hk</string>
37 </test>
38 <test qual="any" name="lang" compare="contains">
33 <string>zh-mo</string>39 <string>zh-mo</string>
34 </test>40 </test>
35 <test qual="any" name="family">41 <test qual="any" name="family">
@@ -43,6 +49,8 @@
43 <match target="pattern">49 <match target="pattern">
44 <test qual="any" name="lang" compare="contains">50 <test qual="any" name="lang" compare="contains">
45 <string>zh-hk</string>51 <string>zh-hk</string>
52 </test>
53 <test qual="any" name="lang" compare="contains">
46 <string>zh-mo</string>54 <string>zh-mo</string>
47 </test>55 </test>
48 <test name="family">56 <test name="family">
4957
=== modified file 'debian/changelog'
--- debian/changelog 2012-02-16 16:36:20 +0000
+++ debian/changelog 2012-09-08 13:33:22 +0000
@@ -1,3 +1,14 @@
1fonts-arphic-uming (0.2.20080216.2-4ubuntu1) UNRELEASED; urgency=low
2
3 * 41-arphic-uming.conf (LP: #1034928)
4 - Updated so there are no multiple values in an alias tag
5 (FontConfig warns these are not supported).
6 * 64-arphic-uming.conf (LP: #1034928)
7 - Updated so there are no multiple values in a test tag
8 (FontConfig warns these are not supported).
9
10 -- Radu Stoica <radumstoica@gmail.com> Sat, 08 Sep 2012 16:22:17 +0300
11
1fonts-arphic-uming (0.2.20080216.2-4) unstable; urgency=low12fonts-arphic-uming (0.2.20080216.2-4) unstable; urgency=low
213
3 * Team upload.14 * Team upload.

Subscribers

People subscribed via source and target branches

to all changes: