rpms/dejavu-fonts/devel dejavu-fonts-fontconfig.conf, 1.7, 1.8 dejavu-fonts.spec, 1.61, 1.62

[Nicolas Mailhot (nim)]

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv677/devel

Modified Files:
	dejavu-fonts-fontconfig.conf dejavu-fonts.spec 
Log Message:
more substitution rules


Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts-fontconfig.conf	11 May 2007 13:49:55 -0000	1.7
+++ dejavu-fonts-fontconfig.conf	3 Jun 2007 22:57:30 -0000	1.8
@@ -8,10 +8,18 @@
      © 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 -->
 <fontconfig>
-<!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
+  <!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
      derivatives which kept original metrics -->
   <match>
     <test name="family">
+      <string>Bitstream Prima Sans</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
       <string>Bitstream Vera Sans</string>
     </test>
     <edit name="family" mode="append" binding="same">
@@ -58,6 +66,15 @@
       <string>DejaVu Sans</string>
     </edit>
   </match>
+  <!-- In case VerajjaPDA stops declaring itself as Verajja -->
+  <match>
+    <test name="family">
+      <string>VerajjaPDA</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
   <match>
     <test name="family">
       <string>Bepa</string>
@@ -74,10 +91,18 @@
       <string>DejaVu Sans</string>
     </edit>
   </match>
-<!-- Declare DejaVu Serif a valid substitute for all known Bitstream Vera Serif
+  <!-- Declare DejaVu Serif a valid substitute for all known Bitstream Vera Serif
      derivatives which kept the original metrics -->
   <match>
     <test name="family">
+      <string>Bitstream Prima Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
       <string>Bitstream Vera Serif</string>
     </test>
     <edit name="family" mode="append" binding="same">
@@ -108,6 +133,15 @@
       <string>DejaVu Serif</string>
     </edit>
   </match>
+  <!-- In case Verajja Serif stops declaring itself as DejaVu Serif -->
+  <match>
+    <test name="family">
+      <string>Verajja Serif</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Serif</string>
+    </edit>
+  </match>
   <match>
     <test name="family">
       <string>Olwen Serif</string>
@@ -116,10 +150,18 @@
       <string>DejaVu Serif</string>
     </edit>
   </match>
-<!-- Declare DejaVu Sans Mono a valid substitute for all known Bitstream Vera
+  <!-- Declare DejaVu Sans Mono a valid substitute for all known Bitstream Vera
      Sans Mono derivatives which kept the original metrics -->
   <match>
     <test name="family">
+      <string>Bitstream Prima Sans Mono</string>
+    </test>
+    <edit name="family" mode="append" binding="same">
+      <string>DejaVu Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family">
       <string>Bitstream Vera Sans Mono</string>
     </test>
     <edit name="family" mode="append" binding="same">
@@ -158,7 +200,7 @@
       <string>DejaVu Sans Mono</string>
     </edit>
   </match>
-<!-- Assign generic name -->
+  <!-- Assign generic name -->
   <alias>
     <family>DejaVu Sans</family>
     <default>
@@ -177,7 +219,7 @@
       <family>monospace</family>
     </default>
   </alias>
-<!-- Alias generic names -->
+  <!-- Alias generic names -->
   <alias>
     <family>sans-serif</family>
     <prefer>


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- dejavu-fonts.spec	31 May 2007 18:32:34 -0000	1.61
+++ dejavu-fonts.spec	3 Jun 2007 22:57:30 -0000	1.62
@@ -17,7 +17,7 @@
 
 Name:      %{fontname}-fonts
 Version:   2.17
-Release:   3%{?alphatag}%{?dist}
+Release:   4%{?alphatag}%{?dist}
 Summary:   DejaVu fonts
 
 Group:     User Interface/X
@@ -159,6 +159,10 @@
 
 
 %changelog
+* Sun Jun 3 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+☺ 2.17-3
+✓ declare DejaVu a valid Bitream Prima™ substitute
+
 * Thu May 31 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 2.17-3
 ✓ small spec cleanups
@@ -166,7 +170,7 @@
 * Sat May 26 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 ☺ 2.17-2
 ✓ perl-Font-TTF has been fixed upstream, use perl(Font::TTF) BR
-✓ remove comment about %{_sysconfdir}/fonts ownership, as it's now owned
+✓ remove comment about /etc/fonts/conf.d ownership, as it's now owned
    by filesystem
 
 * Sun May 13 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>