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

[RaduStoica]

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

[Martin Pitt (pitti)]

Exemplary forwarding to Debian, thanks!

review: Approve

[Martin Pitt (pitti)]

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

=== 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 @@
  -->
 	<alias>
 		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni MBE</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing CN</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing HK</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW MBE</family>
 		<default><family>serif</family></default>
 	</alias>
 <!--
   Monospace faces
  -->
- 	<alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni MBE</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing CN</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing HK</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW MBE</family>
 		<default><family>monospace</family></default>
 	</alias>

=== 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 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-cn</string>
+		</test>
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-sg</string>
 		</test>
 		<test qual="any" name="family">
@@ -17,6 +19,8 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-cn</string>
+		</test>
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-sg</string>
 		</test>
 		<test name="family">
@@ -30,6 +34,8 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-hk</string>
+		</test>
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-mo</string>
 		</test>
 		<test qual="any" name="family">
@@ -43,6 +49,8 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-hk</string>
+		</test>
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-mo</string>
 		</test>
 		<test name="family">

=== 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 @@
+fonts-arphic-uming (0.2.20080216.2-4ubuntu1) UNRELEASED; urgency=low
+
+  * 41-arphic-uming.conf (LP: #1034928)
+    - Updated so there are no multiple values in an alias tag 
+      (FontConfig warns these are not supported).
+  * 64-arphic-uming.conf (LP: #1034928)
+    - Updated so there are no multiple values in a test tag
+      (FontConfig warns these are not supported).
+
+ -- Radu Stoica <[e-mail]>  Sat, 08 Sep 2012 16:22:17 +0300
+
 fonts-arphic-uming (0.2.20080216.2-4) unstable; urgency=low
 
   * Team upload.