[Pkg-fonts-devel] Bug#687156: fontconfig disjunction syntax incorrect

[Iain Lane <iain.lane@canonical.com>]

Package: ttf-wqy-zenhei
Version: 0.9.45-4
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch


Hey,

Here's another fontconfig file with an invalid syntax for disjunction;
patch attached.

Thanks for considering.

-- 
Iain Lane                                  [ iain@orangesquash.org.uk ]
Debian Developer                                   [ laney@debian.org ]
Ubuntu Developer                                   [ laney@ubuntu.com ]

diff -Nru ttf-wqy-zenhei-0.9.45/debian/25-wqy-zenhei.conf ttf-wqy-zenhei-0.9.45/debian/25-wqy-zenhei.conf
--- ttf-wqy-zenhei-0.9.45/debian/25-wqy-zenhei.conf	2011-12-17 11:01:39.000000000 +0000
+++ ttf-wqy-zenhei-0.9.45/debian/25-wqy-zenhei.conf	2012-09-10 12:31:46.000000000 +0100
@@ -6,7 +6,33 @@
   <match target="font">
         <test qual="any" name="family">
                 <string>WenQuanYi Zen Hei</string>
+        </test> 
+        <edit name="globaladvance"><bool>false</bool></edit>
+        <edit name="spacing"><int>0</int></edit>
+        <edit name="antialias" mode="assign"><bool>true</bool></edit>
+        <edit name="hinting" mode="assign"><bool>true</bool></edit>
+        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
+        <edit name="autohint" mode="assign"><bool>false</bool></edit>
+        <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit>
+        <edit name="rgba" mode="assign"><const>none</const></edit>
+        <edit name="embeddedbitmap"><bool>false</bool></edit>
+  </match>
+  <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驿正黑</string>
+        </test> 
+        <edit name="globaladvance"><bool>false</bool></edit>
+        <edit name="spacing"><int>0</int></edit>
+        <edit name="antialias" mode="assign"><bool>true</bool></edit>
+        <edit name="hinting" mode="assign"><bool>true</bool></edit>
+        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
+        <edit name="autohint" mode="assign"><bool>false</bool></edit>
+        <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit>
+        <edit name="rgba" mode="assign"><const>none</const></edit>
+        <edit name="embeddedbitmap"><bool>false</bool></edit>
+  </match>
+  <match target="font">
+        <test qual="any" name="family">
                 <string>文泉驛正黑</string>
         </test> 
         <edit name="globaladvance"><bool>false</bool></edit>
diff -Nru ttf-wqy-zenhei-0.9.45/debian/changelog ttf-wqy-zenhei-0.9.45/debian/changelog