From 398c5882417161dc61fc0c09f27a748ac1db1ddd Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Sep 15 2006 18:27:37 +0000
Subject: auto-import dejavu-fonts-2.10.0-0.1.rc1.fc6 on branch devel from dejavu-fonts-2.10.0-0.1.rc1.fc6.src.rpm

2.10 rc test, for brave new fontconfig world

---

diff --git a/.cvsignore b/.cvsignore
index 62044f0..19ef65b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-2.9.tar.gz
+dejavu-sfd-20060913-1149.tar.gz
diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf
index 064f205..7d284d1 100644
--- a/dejavu-fonts-experimental-fontconfig.conf
+++ b/dejavu-fonts-experimental-fontconfig.conf
@@ -1,14 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/20-dejavu-experimental.conf
+<!-- /etc/fonts/conf.d/60-dejavu-experimental.conf
 
      Define aliasing and other fontconfig stuff for DejaVu experimental
      families
 
      © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-     This file is distributed under the terms of the GNU General
-     Public License (GPL) version 2. Copies of the GPL can be obtained from:
-     http://www.gnu.org/licenses/gpl.html
 
      $Id$
 -->
@@ -46,6 +43,19 @@
       <string>DejaVu Serif Condensed</string>
     </edit>
   </match>
+<!-- Assign generic name -->
+  <alias>
+    <family>DejaVu Sans Condensed</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>DejaVu Serif Condensed</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">
diff --git a/dejavu-fonts-fontconfig.conf b/dejavu-fonts-fontconfig.conf
index 9d7b2ae..8da2704 100644
--- a/dejavu-fonts-fontconfig.conf
+++ b/dejavu-fonts-fontconfig.conf
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/20-dejavu.conf
+<!-- /etc/fonts/conf.d/60-dejavu.conf
 
-     Define aliasing and other fontconfig settings for DejaVu main families
+     Define aliasing and other fontconfig settings for DejaVu stable families
 
      © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
-     This file is distributed under the terms of the GNU General
-     Public License (GPL) version 2. Copies of the GPL can be obtained from:
-     http://www.gnu.org/licenses/gpl.html
 
      $Id$
 -->
@@ -162,31 +159,44 @@
       <string>DejaVu Sans Mono</string>
     </edit>
   </match>
+<!-- Assign generic name -->
+  <alias>
+    <family>DejaVu Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>DejaVu Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>DejaVu Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
 <!-- Alias generic names -->
-  <match>
-    <test name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Serif</string>
-    </edit>
-  </match>
-  <match>
-    <test name="family">
-      <string>monospace</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>DejaVu Sans Mono</string>
-    </edit>
-  </match>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>DejaVu Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>DejaVu Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>DejaVu Sans Mono</family>
+    </prefer>
+  </alias>
 <!-- Turn off hinting at small sizes -->
   <match target="font">
     <test name="family">
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 575678e..71454c6 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -1,9 +1,9 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-#%define alphatag       20060618svn945
+%define alphatag        20060913svn1149
 #%define alphatag       rc1
 
-%define archiveversion  2.9
+%define archiveversion  20060913-1149
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 
@@ -12,8 +12,8 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.9.0
-Release:   1%{?dist}
+Version:   2.10.0
+Release:   0.1.%{alphatag}%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -93,8 +93,8 @@ install -m 0644 generated/*.ttf  %{buildroot}%{fontdir}
 
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/20-dejavu.conf
-install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-dejavu-experimental.conf
+install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/60-dejavu.conf
+install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/60-dejavu-experimental.conf
 
 
 %clean
@@ -133,7 +133,7 @@ fi
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
-%config %{fontconfdir}/conf.d/20-dejavu.conf
+%config %{fontconfdir}/conf.d/60-dejavu.conf
 
 %dir %{fontdir}
 %{fontdir}/DejaVu*.ttf
@@ -145,7 +145,7 @@ fi
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/20-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/60-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -153,6 +153,10 @@ fi
 
 
 %changelog
+* Fri Sep 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.10.0-0.1.20060913-1149
+- match dejavu-lgc core conf style once again
+
 * Wed Aug 30 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 2.9.0-1
 - tweak fontconfig settings to match the style the dejavu-lgc core package
diff --git a/sources b/sources
index ac4d994..c1ea5a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b04d4e8a43ec342503de954902d93eb  dejavu-sfd-2.9.tar.gz
+34d7bced7781d041e33a4ca6f228632c  dejavu-sfd-20060913-1149.tar.gz