[cantarell-fonts] Tweak fontconfig script not to override system font by default

[Cosimo Cecchi <cosimoc src gnome org>]

commit d0a582c32d8456a2ee74f027b299c8b493bdecc9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Feb 18 15:26:05 2011 -0500

    Tweak fontconfig script not to override system font by default

 fontconfig/31-cantarell.conf |   18 ++++++++++++++++++
 fontconfig/57-cantarell.conf |   23 -----------------------
 fontconfig/Makefile.am       |    2 +-
 3 files changed, 19 insertions(+), 24 deletions(-)
---
diff --git a/fontconfig/31-cantarell.conf b/fontconfig/31-cantarell.conf
new file mode 100644
index 0000000..2b3ab09
--- /dev/null
+++ b/fontconfig/31-cantarell.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Generic name assignment -->
+  <match target="pattern">
+    <test qual="any" name="family">
+      <string>Cantarell</string>
+    </test>
+    <edit name="family" mode="assign" binding="weak">
+      <string>Cantarell</string>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index 335a682..a6fb360 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -1,6 +1,6 @@
 configdir = $(datadir)/fontconfig/conf.avail/
 config_DATA = \
-	57-cantarell.conf
+	31-cantarell.conf
 
 EXTRA_DIST = $(config_DATA)