[Pkg-fonts-devel] Bug#687172: Fontconfig file warnings
Package: fonts-sil-andika
Version: 1.002-2
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch
Hi,
Newer fontconfigs (not in Debian yet) expose some latent incorrectness
in andika's fontconfig file. I think I fixed them in the attached patch,
uploaded to Ubuntu, but please do review because I'm not 100% confident.
Here's the changelog I used:
* Fix errors in 65-andika.conf
- <test> can only contain one element. To implement disjunction, duplicate
the <match> block and vary the contents of <test>. Here we reduce the
number of branches by comparing for "contains" "Andika Design Review"
(previously "Andika Design Review [A-H]")
- <alias> can only alias one family at a time. Duplicate and vary the name
being aliased.
Cheers,
--
Iain Lane [ iain@orangesquash.org.uk ]
Debian Developer [ laney@debian.org ]
Ubuntu Developer [ laney@ubuntu.com ]
diff -Nru fonts-sil-andika-1.002/debian/65-andika.conf fonts-sil-andika-1.002/debian/65-andika.conf
--- fonts-sil-andika-1.002/debian/65-andika.conf 2011-10-31 06:59:54.000000000 +0000
+++ fonts-sil-andika-1.002/debian/65-andika.conf 2012-09-10 14:56:09.000000000 +0100
@@ -3,15 +3,15 @@
<!-- This configuration file is free to modify -->
<fontconfig>
<match target="pattern">
+ <test qual="any" name="family" compare="contains">
+ <string>Andika Design Review</string>
+ </test>
+ <edit name="family" mode="assign">
+ <string>Andika</string>
+ </edit>
+ </match>
+ <match target="pattern">
<test qual="any" name="family">
- <string>Andika Design Review A</string>
- <string>Andika Design Review B</string>
- <string>Andika Design Review C</string>
- <string>Andika Design Review D</string>
- <string>Andika Design Review E</string>
- <string>Andika Design Review F</string>
- <string>Andika Design Review G</string>
- <string>Andika Design Review H</string>
<string>Andika Basic</string>
</test>
<edit name="family" mode="assign">
@@ -21,13 +21,53 @@
<!-- Aliases for Andika Design Reviews -->
<alias>
<family>Andika Design Review A</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review B</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review C</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review D</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review E</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review F</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review G</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Design Review H</family>
+ <accept>
+ <family>Andika</family>
+ </accept>
+ </alias>
+ <alias>
<family>Andika Basic</family>
<accept>
<family>Andika</family>
diff -Nru fonts-sil-andika-1.002/debian/changelog fonts-sil-andika-1.002/debian/changelog
Reply to: