Blob Blame History Raw
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu.conf	2007-10-28 21:22:07.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu.conf
-
-        Disable hinting manually at smaller sizes (< 8ppem)
-        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
-        derived from Vera.
-
-	The Bistream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints. The initial Vera release
-	didn't include the right instructions in the 'prep' table.
- -->
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Sans</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Sans Mono</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Serif</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-experimental.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-experimental.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-experimental.conf	2007-10-28 21:22:07.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-experimental.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-experimental.conf
-
-        Disable hinting manually at smaller sizes (< 8ppem)
-        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
-        derived from Vera.
-
-	The Bistream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints. The initial Vera release
-	didn't include the right instructions in the 'prep' table.
- -->
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Sans Condensed</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Sans Mono Condensed</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu Serif Condensed</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc.conf	2007-10-28 21:22:07.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc.conf
-
-        Disable hinting manually at smaller sizes (< 8ppem)
-        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
-        derived from Vera.
-
-	The Bistream Vera fonts have GASP entries suggesting that hinting be
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints. The initial Vera release
-	didn't include the right instructions in the 'prep' table.
- -->
-  <match target="font">
-    <test name="family">
-      <string>DejaVu LGC Sans</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu LGC Sans Condensed</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu LGC Sans Mono</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu LGC Serif</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-  <match target="font">
-    <test name="family">
-      <string>DejaVu LGC Serif Condensed</string>
-    </test>
-    <test compare="less" name="pixelsize">
-      <double>7.5</double>
-    </test>
-    <edit name="hinting">
-      <bool>false</bool>
-    </edit>
-  </match>
-</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans.conf	2008-11-08 12:30:47.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu LGC Sans</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-sans-mono.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu LGC Sans Mono</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-serif.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-serif.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-lgc-serif.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-lgc-serif.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu LGC Serif</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Sans</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans-mono.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans-mono.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-sans-mono.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-sans-mono.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Sans Mono</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-serif.conf dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-serif.conf
--- dejavu-fonts-2.26.orig/fontconfig/20-unhint-small-dejavu-serif.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/20-unhint-small-dejavu-serif.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Serif</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu.conf dejavu-fonts-2.26/fontconfig/57-dejavu.conf
--- dejavu-fonts-2.26.orig/fontconfig/57-dejavu.conf	2007-10-28 21:22:07.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/57-dejavu.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/57-dejavu.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu stable families
-
-     © 2006-2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
-<fontconfig>
-  <!-- Font substitution rules -->
-  <alias binding="same">
-    <family>Arev Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bepa</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Hunky Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Sans</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Verajja</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
-  <alias binding="same">
-    <family>VerajjaPDA</family>
-    <accept>
-      <family>DejaVu Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bepa Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Sans Mono</family>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Hunky Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
-  <alias binding="same">
-    <family>Verajja Serif</family>
-    <accept>
-      <family>DejaVu Serif</family>
-    </accept>
-  </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu Sans Mono</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu Serif</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans.conf dejavu-fonts-2.26/fontconfig/57-dejavu-sans.conf
--- dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/57-dejavu-sans.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/57-dejavu-sans.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu Sans.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Arev Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bepa</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu LGC Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Verajja</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
+  <alias binding="same">
+    <family>VerajjaPDA</family>
+    <accept>
+      <family>DejaVu Sans</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans-mono.conf dejavu-fonts-2.26/fontconfig/57-dejavu-sans-mono.conf
--- dejavu-fonts-2.26.orig/fontconfig/57-dejavu-sans-mono.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/57-dejavu-sans-mono.conf	2008-11-08 12:32:17.000000000 +0100
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/57-dejavu-sans-mono.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu Sans Mono.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bepa Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu LGC Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans Mono</family>
+    <accept>
+      <family>DejaVu Sans Mono</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu Sans Mono</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/57-dejavu-serif.conf dejavu-fonts-2.26/fontconfig/57-dejavu-serif.conf
--- dejavu-fonts-2.26.orig/fontconfig/57-dejavu-serif.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/57-dejavu-serif.conf	2008-11-08 12:32:32.000000000 +0100
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/57-dejavu-serif.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu Serif.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bitstream Prima Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu LGC Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
+  <alias binding="same">
+    <family>Verajja Serif</family>
+    <accept>
+      <family>DejaVu Serif</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc.conf
--- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc.conf	2007-10-28 21:22:07.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/58-dejavu-lgc.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu LGC
-
-     © 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
-<fontconfig>
-  <!-- Font substitution rules -->
-  <alias binding="same">
-    <family>Arev Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bepa</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Hunky Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Verajja</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
-  <alias binding="same">
-    <family>VerajjaPDA</family>
-    <accept>
-      <family>DejaVu LGC Sans</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu Sans Condensed</family>
-    <accept>
-      <family>DejaVu LGC Sans Condensed</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Toga Sans</family>
-    <accept>
-      <family>DejaVu LGC Sans Condensed</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bepa Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Sans Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Sans Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu Sans Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Sans Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Sans Mono</family>
-    <accept>
-      <family>DejaVu LGC Sans Mono</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Prima Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Bitstream Vera Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Hunky Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Olwen Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>SUSE Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <!-- In case Verajja Serif stops declaring itself as DejaVu LGC Serif -->
-  <alias binding="same">
-    <family>Verajja Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu Serif Condensed</family>
-    <accept>
-      <family>DejaVu LGC Serif Condensed</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Toga Serif</family>
-    <accept>
-      <family>DejaVu LGC Serif Condensed</family>
-    </accept>
-  </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu LGC Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu LGC Sans</family>
-    <family>DejaVu LGC Sans Condensed</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>DejaVu LGC Serif</family>
-    <family>DejaVu LGC Serif Condensed</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu LGC Sans Mono</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu LGC Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu LGC Serif</family>
-    </prefer>
-  </alias>
-</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans.conf
--- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-sans.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu LGC Sans.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Arev Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bepa</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Verajja</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
+  <alias binding="same">
+    <family>VerajjaPDA</family>
+    <accept>
+      <family>DejaVu LGC Sans</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu LGC Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu LGC Sans</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans-mono.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans-mono.conf
--- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-sans-mono.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-sans-mono.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-sans-mono.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu LGC Sans Mono.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bepa Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Prima Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Sans Mono</family>
+    <accept>
+      <family>DejaVu LGC Sans Mono</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu LGC Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu LGC Sans Mono</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-serif.conf dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-serif.conf
--- dejavu-fonts-2.26.orig/fontconfig/58-dejavu-lgc-serif.conf	1970-01-01 01:00:00.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/58-dejavu-lgc-serif.conf	2008-11-08 12:30:48.000000000 +0100
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!-- /etc/fonts/conf.d/58-dejavu-lgc-serif.conf
+
+     Define aliasing and other fontconfig settings for
+     DejaVu LGC Serif.
+
+     © 2006-2008 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+-->
+<fontconfig>
+  <!-- Font substitution rules -->
+  <alias binding="same">
+    <family>Bitstream Prima Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Bitstream Vera Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>DejaVu Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Hunky Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Olwen Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>SUSE Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
+  <alias binding="same">
+    <family>Verajja Serif</family>
+    <accept>
+      <family>DejaVu LGC Serif</family>
+    </accept>
+  </alias>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>DejaVu LGC Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu LGC Serif</family>
+    </prefer>
+  </alias>
+</fontconfig>
diff -uNr dejavu-fonts-2.26.orig/fontconfig/61-dejavu-experimental.conf dejavu-fonts-2.26/fontconfig/61-dejavu-experimental.conf
--- dejavu-fonts-2.26.orig/fontconfig/61-dejavu-experimental.conf	2007-10-28 21:22:07.000000000 +0100
+++ dejavu-fonts-2.26/fontconfig/61-dejavu-experimental.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!-- /etc/fonts/conf.d/61-dejavu-experimental.conf
-
-     Define aliasing and other fontconfig settings for
-     DejaVu experimental families
-
-     © 2006-2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
--->
-<fontconfig>
-  <!-- Font substitution rules -->
-  <alias binding="same">
-    <family>DejaVu LGC Sans Condensed</family>
-    <accept>
-      <family>DejaVu Sans Condensed</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Toga Sans</family>
-    <accept>
-      <family>DejaVu Sans Condensed</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>DejaVu LGC Serif Condensed</family>
-    <accept>
-      <family>DejaVu Serif Condensed</family>
-    </accept>
-  </alias>
-  <alias binding="same">
-    <family>Toga Serif</family>
-    <accept>
-      <family>DejaVu Serif Condensed</family>
-    </accept>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu Sans Condensed</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu Serif Condensed</family>
-    </prefer>
-  </alias>
-</fontconfig>