rpms/dejavu-fonts/FC-5 .cvsignore, 1.17, 1.18 dejavu-fonts-experimental-fontconfig.conf, 1.1, 1.2 dejavu-fonts-fontconfig.conf, 1.2, 1.3 dejavu-fonts.spec, 1.26, 1.27 sources, 1.17, 1.18
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Wed Aug 30 21:50:03 UTC 2006
Author: nim
Update of /cvs/extras/rpms/dejavu-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15150/FC-5
Modified Files:
.cvsignore dejavu-fonts-experimental-fontconfig.conf
dejavu-fonts-fontconfig.conf dejavu-fonts.spec sources
Log Message:
auto-import dejavu-fonts-2.9.0-1.fc5 on branch FC-5 from dejavu-fonts-2.9.0-1.fc5.src.rpm
2.9.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 16 Jul 2006 15:10:48 -0000 1.17
+++ .cvsignore 30 Aug 2006 21:50:03 -0000 1.18
@@ -1 +1 @@
-dejavu-sfd-2.8.tar.gz
+dejavu-sfd-2.9.tar.gz
Index: dejavu-fonts-experimental-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-experimental-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dejavu-fonts-experimental-fontconfig.conf 16 Jul 2006 15:10:48 -0000 1.1
+++ dejavu-fonts-experimental-fontconfig.conf 30 Aug 2006 21:50:03 -0000 1.2
@@ -13,36 +13,40 @@
$Id$
-->
<fontconfig>
-<!-- Declare generics -->
- <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>
-<!-- Declare DejaVu Sans Condensed a valid Toga Sans substitute -->
- <alias>
- <family>Toga Sans</family>
- <accept>
- <family>Toga Sans</family>
- <family>DejaVu Sans Condensed</family>
- </accept>
- </alias>
-<!-- Declare DejaVu Serif Condensed a valid Toga Serif substitute -->
- <alias>
- <family>Toga Serif</family>
- <accept>
- <family>Toga Serif</family>
- <family>DejaVu Serif Condensed</family>
- </accept>
- </alias>
-<!-- Use the same trick as Bitstream Vera -->
+<!-- Declare substitutes -->
+ <match>
+ <test name="family">
+ <string>DejaVu LGC Sans Condensed</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Condensed</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Toga Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Condensed</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>DejaVu LGC Serif Condensed</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif Condensed</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Toga Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif Condensed</string>
+ </edit>
+ </match>
+<!-- Turn off hinting at small sizes -->
<match target="font">
<test name="family">
<string>DejaVu Sans Condensed</string>
@@ -54,7 +58,7 @@
<bool>false</bool>
</edit>
</match>
- <match target="font">
+ <match target="font">
<test name="family">
<string>DejaVu Serif Condensed</string>
</test>
Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dejavu-fonts-fontconfig.conf 16 Jul 2006 15:10:48 -0000 1.2
+++ dejavu-fonts-fontconfig.conf 30 Aug 2006 21:50:03 -0000 1.3
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/20-dejavu.conf
- Define aliasing ant other fontconfig settings for DejaVu main families
+ Define aliasing and other fontconfig settings for DejaVu main families
© 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
This file is distributed under the terms of the GNU General
@@ -12,138 +12,182 @@
$Id$
-->
<fontconfig>
-<!-- Declare generics -->
- <alias>
- <family>DejaVu Sans</family>
- <default>
- <family>sans-serif</family>
- </default>
- </alias>
- <alias>
- <family>DejaVu Serif</family>
- <default>
- <family>serif</family>
- </default>
- </alias>
-<!-- Monospace face -->
- <alias>
- <family>DejaVu Sans Mono</family>
- <default>
- <family>monospace</family>
- </default>
- </alias>
<!-- Declare DejaVu Sans a valid substitute for all known Bitstream Vera Sans
derivatives which kept original metrics -->
- <alias>
- <family>Bitstream Vera Sans</family>
- <accept>
- <family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
- </accept>
- </alias>
- <alias>
- <family>Arev Sans</family>
- <accept>
- <family>Arev Sans</family>
- <family>DejaVu Sans</family>
- </accept>
- </alias>
- <alias>
- <family>SUSE Sans</family>
- <accept>
- <family>SUSE Sans</family>
- <family>DejaVu Sans</family>
- </accept>
- </alias>
- <alias>
- <family>Hunky Sans</family>
- <accept>
- <family>DejaVu Sans</family>
- <family>Hunky Sans</family>
- </accept>
- </alias>
- <alias>
- <family>Verajja</family>
- <accept>
- <family>DejaVu Sans</family>
- <family>Verajja</family>
- </accept>
- </alias>
- <alias>
- <family>Bepa</family>
- <accept>
- <family>DejaVu Sans</family>
- <family>Bepa</family>
- </accept>
- </alias>
- <alias>
- <family>Olwen Sans</family>
- <accept>
- <family>DejaVu Sans</family>
- <family>Olwen Sans</family>
- </accept>
- </alias>
+ <match>
+ <test name="family">
+ <string>Bitstream Vera Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>DejaVu LGC Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Arev Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>SUSE Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Hunky Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Verajja</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Bepa</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Olwen Sans</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans</string>
+ </edit>
+ </match>
<!-- Declare DejaVu Serif a valid substitute for all known Bitstream Vera Serif
derivatives which kept the original metrics -->
- <alias>
- <family>Bitstream Vera Serif</family>
- <accept>
- <family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
- </accept>
- </alias>
- <alias>
- <family>SUSE Serif</family>
- <accept>
- <family>SUSE Serif</family>
- <family>DejaVu Serif</family>
- </accept>
- </alias>
- <alias>
- <family>Hunky Serif</family>
- <accept>
- <family>Hunky Serif</family>
- <family>DejaVu Serif</family>
- </accept>
- </alias>
- <alias>
- <family>Olwen Serif</family>
- <accept>
- <family>Olwen Serif</family>
- <family>DejaVu Serif</family>
- </accept>
- </alias>
+ <match>
+ <test name="family">
+ <string>Bitstream Vera Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>DejaVu LGC Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>SUSE Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Hunky Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Olwen Serif</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Serif</string>
+ </edit>
+ </match>
<!-- Declare DejaVu Sans Mono a valid substitute for all known Bitstream Vera
Sans Mono derivatives which kept the original metrics -->
- <alias>
- <family>Bitstream Vera Sans Mono</family>
- <accept>
- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- </accept>
- </alias>
- <alias>
- <family>SUSE Sans Mono</family>
- <accept>
- <family>SUSE Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- </accept>
- </alias>
- <alias>
- <family>Bepa Mono</family>
- <accept>
- <family>Bepa Mono</family>
- <family>DejaVu Sans Mono</family>
- </accept>
- </alias>
- <alias>
- <family>Olwen Sans Mono</family>
- <accept>
- <family>Olwen Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- </accept>
- </alias>
-<!-- Use the same trick as Bitstream Vera -->
+ <match>
+ <test name="family">
+ <string>Bitstream Vera Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>DejaVu LGC Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>SUSE Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Bepa Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Mono</string>
+ </edit>
+ </match>
+ <match>
+ <test name="family">
+ <string>Olwen Sans Mono</string>
+ </test>
+ <edit name="family" mode="append" binding="same">
+ <string>DejaVu Sans Mono</string>
+ </edit>
+ </match>
+<!-- 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>
+<!-- Turn off hinting at small sizes -->
<match target="font">
<test name="family">
<string>DejaVu Sans</string>
Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dejavu-fonts.spec 16 Jul 2006 15:10:48 -0000 1.26
+++ dejavu-fonts.spec 30 Aug 2006 21:50:03 -0000 1.27
@@ -3,7 +3,7 @@
#%define alphatag 20060618svn945
#%define alphatag rc1
-%define archiveversion 2.8
+%define archiveversion 2.9
%define fontdir %{_datadir}/fonts/%{name}
%define fontconfdir %{_sysconfdir}/fonts
%define xsldir %{_datadir}/xml/%{name}
@@ -13,13 +13,13 @@
%define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
Name: dejavu-fonts
-Version: 2.8.0
+Version: 2.9.0
Release: 1%{?dist}
Summary: DejaVu fonts
Group: User Interface/X
License: Redistributable, with restrictions
URL: http://dejavu.sf.net/
-Source: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
+Source0: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz
# Make DejaVu fonts the default in Sans, Serif and Monospace
Source1: %{name}-makedefault.xsl
# Substitute the glyphs of another font in Sans, Serif and Monospace for Arabic and Farsi
@@ -125,7 +125,7 @@
%check
# Current upstream files are full of "problems"
# Do not panic if the output is long
-./problems.pl -l 3 *.sfd
+./problems.pl *.sfd
%install
@@ -253,6 +253,11 @@
%changelog
+* 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
+ adopted
+
* Sun Jul 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.8.0-1
- 2.8.0 final
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 16 Jul 2006 15:10:48 -0000 1.17
+++ sources 30 Aug 2006 21:50:03 -0000 1.18
@@ -1 +1 @@
-d3dd043f56c4eb1a54e486a78682ad67 dejavu-sfd-2.8.tar.gz
+0b04d4e8a43ec342503de954902d93eb dejavu-sfd-2.9.tar.gz
More information about the fedora-extras-commits
mailing list