rpms/dejavu-fonts/FC-5 .cvsignore, 1.18, 1.19 dejavu-fonts-experimental-fontconfig.conf, 1.2, 1.3 dejavu-fonts-fontconfig.conf, 1.3, 1.4 dejavu-fonts.spec, 1.27, 1.28 sources, 1.18, 1.19

Nicolas Mailhot (nim) fedora-extras-commits at redhat.com
Sun Sep 17 13:34:39 UTC 2006


Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23779/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.10-1.fc5 on branch FC-5 from dejavu-fonts-2.10-1.fc5.src.rpm
2.10


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	30 Aug 2006 21:50:03 -0000	1.18
+++ .cvsignore	17 Sep 2006 13:34:39 -0000	1.19
@@ -1 +1 @@
-dejavu-sfd-2.9.tar.gz
+dejavu-sfd-2.10.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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dejavu-fonts-experimental-fontconfig.conf	30 Aug 2006 21:50:03 -0000	1.2
+++ dejavu-fonts-experimental-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.3
@@ -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/58-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">


Index: dejavu-fonts-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts-fontconfig.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dejavu-fonts-fontconfig.conf	30 Aug 2006 21:50:03 -0000	1.3
+++ dejavu-fonts-fontconfig.conf	17 Sep 2006 13:34:39 -0000	1.4
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/20-dejavu.conf
+<!-- /etc/fonts/conf.d/58-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,6 +159,25 @@
       <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">


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dejavu-fonts.spec	30 Aug 2006 21:50:03 -0000	1.27
+++ dejavu-fonts.spec	17 Sep 2006 13:34:39 -0000	1.28
@@ -1,9 +1,8 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-#%define alphatag       20060618svn945
-#%define alphatag       rc1
+#%define alphatag        20060913svn1149
 
-%define archiveversion  2.9
+%define archiveversion  2.10
 %define fontdir         %{_datadir}/fonts/%{name}
 %define fontconfdir     %{_sysconfdir}/fonts
 %define xsldir          %{_datadir}/xml/%{name}
@@ -13,7 +12,7 @@
 %define UnicodeData     %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.9.0
+Version:   2.10
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
@@ -143,8 +142,8 @@
 
 # Fontconfig overrides for some scripts
 install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
-install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-dejavu.conf
-install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/20-dejavu-experimental.conf
+install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/58-dejavu.conf
+install -m 0644 %{SOURCE5} %{buildroot}%{fontconfdir}/conf.d/58-dejavu-experimental.conf
 install -m 0644 %{SOURCE6} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-persian-override.conf
 install -m 0644 %{SOURCE7} %{buildroot}%{fontconfdir}/conf.d/00-dejavu-arabic-override.conf
 
@@ -217,7 +216,7 @@
 %defattr(0644,root,root,0755)
 %doc *.txt AUTHORS BUGS LICENSE NEWS README
 
-%config %{fontconfdir}/conf.d/20-dejavu.conf
+%config %{fontconfdir}/conf.d/58-dejavu.conf
 
 %dir %{fontdir}
 %{fontdir}/DejaVu*.ttf
@@ -229,7 +228,7 @@
 %files experimental
 %defattr(0644,root,root,0755)
 
-%config %{fontconfdir}/conf.d/20-dejavu-experimental.conf
+%config %{fontconfdir}/conf.d/58-dejavu-experimental.conf
 
 %{fontdir}/DejaVu*Condensed*.ttf
 %{fontdir}/DejaVu*ExtraLight*.ttf
@@ -253,6 +252,9 @@
 
 
 %changelog
+* Sun Sep 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 2.10
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	30 Aug 2006 21:50:03 -0000	1.18
+++ sources	17 Sep 2006 13:34:39 -0000	1.19
@@ -1 +1 @@
-0b04d4e8a43ec342503de954902d93eb  dejavu-sfd-2.9.tar.gz
+2d0c48afaba583833d90d30ff33d320a  dejavu-sfd-2.10.tar.gz




More information about the scm-commits mailing list