Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab39d63a65ca7ca43ab0a59a606ee9df18dcf5f9
commit ab39d63a65ca7ca43ab0a59a606ee9df18dcf5f9
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Nov 7 22:49:04 2007 +0100
dejavu-ttf-2.21-2-i686
fix up dejavu-ttf.xml
diff --git a/source/x11/dejavu-ttf/FrugalBuild
b/source/x11/dejavu-ttf/FrugalBuild
index eb4b321..f3a40cd 100644
--- a/source/x11/dejavu-ttf/FrugalBuild
+++ b/source/x11/dejavu-ttf/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=dejavu-ttf
pkgver=2.21
-pkgrel=1
+pkgrel=2
pkgdesc="DejaVu fonts"
_F_sourceforge_dirname="dejavu"
_F_sourceforge_ext=".tar.bz2"
@@ -14,6 +14,8 @@ makedepends=('fop-devel')
groups=('x11' 'xorg-core' 'xorg-fonts')
archs=('i686' 'x86_64')
source=($source dejavu-ttf.xml)
+sha1sums=('5f3d3362cf4e6fc269f9d429ab9d25d095e8af48' \
+ 'e78cf8b8a2484540820629e93f73f794e061eeed')
build()
{
@@ -29,6 +31,3 @@ build()
Fmkdir /usr/share/fop
Ffilerel *.xml /usr/share/fop
}
-
-sha1sums=('5f3d3362cf4e6fc269f9d429ab9d25d095e8af48' \
- '3578ab6beff7c455e7575006760e5f73c3d05093')
diff --git a/source/x11/dejavu-ttf/dejavu-ttf.xml
b/source/x11/dejavu-ttf/dejavu-ttf.xml
index 1da1fe5..4cb0a29 100644
--- a/source/x11/dejavu-ttf/dejavu-ttf.xml
+++ b/source/x11/dejavu-ttf/dejavu-ttf.xml
@@ -1,105 +1,104 @@
<configuration>
<fonts>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSans.xml'
- embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans.ttf'>
- <font-triplet name='DejaVuSans' style='normal'
weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuCondensedSans.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSans.ttf'>
+ <font-triplet name='DejaVuCondensedSans' style='normal'
weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSans-Bold.xml'
- embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf'>
- <font-triplet name='DejaVuSans' style='normal'
weight='bold'/>
+
metrics-file='/usr/share/fop/DejaVuCondensedSansBold.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSansBold.ttf'>
+ <font-triplet name='DejaVuCondensedSans' style='normal'
weight='bold'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSans-Oblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf'>
- <font-triplet name='DejaVuSans' style='italic'
weight='normal'/>
+
metrics-file='/usr/share/fop/DejaVuCondensedSansBoldOblique.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSansBoldOblique.ttf'>
+ <font-triplet name='DejaVuCondensedSans' style='italic'
weight='bold'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSans-BoldOblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf'>
- <font-triplet name='DejaVuSans' style='italic'
weight='bold'/>
+
metrics-file='/usr/share/fop/DejaVuCondensedSansOblique.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSansOblique.ttf'>
+ <font-triplet name='DejaVuCondensedSans' style='italic'
weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSansCondensed.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed.ttf'>
- <font-triplet name='DejaVuSansCondensed' style='normal'
weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuCondensedSerif.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerif.ttf'>
+ <font-triplet name='DejaVuCondensedSerif'
style='normal' weight='normal'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSansCondensed-Bold.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed-Bold.ttf'>
- <font-triplet name='DejaVuSansCondensed' style='normal'
weight='bold'/>
+
metrics-file='/usr/share/fop/DejaVuCondensedSerifBold.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerifBold.ttf'>
+ <font-triplet name='DejaVuCondensedSerif'
style='normal' weight='bold'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSansCondensed-Oblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed-Oblique.ttf'>
- <font-triplet name='DejaVuSansCondensed' style='italic'
weight='normal'/>
+
metrics-file='/usr/share/fop/DejaVuCondensedSerifBoldItalic.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerifBoldItalic.ttf'>
+ <font-triplet name='DejaVuCondensedSerif'
style='italic' weight='bold'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSansCondensed-BoldOblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansCondensed-BoldOblique.ttf'>
- <font-triplet name='DejaVuSansCondensed' style='italic'
weight='bold'/>
+
metrics-file='/usr/share/fop/DejaVuCondensedSerifItalic.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuCondensedSerifItalic.ttf'>
+ <font-triplet name='DejaVuCondensedSerif'
style='italic' weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSansMono.xml'
- embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono.ttf'>
- <font-triplet name='DejaVuSansMono' style='normal'
weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuMonoSans.xml'
+ embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSans.ttf'>
+ <font-triplet name='DejaVuMonoSans' style='normal'
weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSansMono-Bold.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf'>
- <font-triplet name='DejaVuSansMono' style='normal'
weight='bold'/>
+ metrics-file='/usr/share/fop/DejaVuMonoSansBold.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSansBold.ttf'>
+ <font-triplet name='DejaVuMonoSans' style='normal'
weight='bold'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSansMono-Oblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf'>
- <font-triplet name='DejaVuSansMono' style='italic'
weight='normal'/>
+
metrics-file='/usr/share/fop/DejaVuMonoSansBoldOblique.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSansBoldOblique.ttf'>
+ <font-triplet name='DejaVuMonoSans' style='italic'
weight='bold'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSansMono-BoldOblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf'>
- <font-triplet name='DejaVuSansMono' style='italic'
weight='bold'/>
-
+ metrics-file='/usr/share/fop/DejaVuMonoSansOblique.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuMonoSansOblique.ttf'>
+ <font-triplet name='DejaVuMonoSans' style='italic'
weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSerif.xml'
- embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif.ttf'>
- <font-triplet name='DejaVuSerif' style='normal'
weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuSans.xml'
+ embed-file='/usr/lib/X11/fonts/TTF/DejaVuSans.ttf'>
+ <font-triplet name='DejaVuSans' style='normal'
weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSerif-Bold.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf'>
- <font-triplet name='DejaVuSerif' style='normal'
weight='bold'/>
+ metrics-file='/usr/share/fop/DejaVuSansBold.xml'
+ embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansBold.ttf'>
+ <font-triplet name='DejaVuSans' style='normal'
weight='bold'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSerif-Oblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif-Oblique.ttf'>
- <font-triplet name='DejaVuSerif' style='italic'
weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuSansBoldOblique.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansBoldOblique.ttf'>
+ <font-triplet name='DejaVuSans' style='italic'
weight='bold'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSerif-BoldOblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif-BoldOblique.ttf'>
- <font-triplet name='DejaVuSerif' style='italic'
weight='bold'/>
+ metrics-file='/usr/share/fop/DejaVuSansOblique.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSansOblique.ttf'>
+ <font-triplet name='DejaVuSans' style='italic'
weight='normal'/>
</font>
<font kerning='yes'
- metrics-file='/usr/share/fop/DejaVuSerifCondensed.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed.ttf'>
- <font-triplet name='DejaVuSerifCondensed'
style='normal' weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuSerif.xml'
+ embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerif.ttf'>
+ <font-triplet name='DejaVuSerif' style='normal'
weight='normal'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSerifCondensed-Bold.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed-Bold.ttf'>
- <font-triplet name='DejaVuSerifCondensed'
style='normal' weight='bold'/>
+ metrics-file='/usr/share/fop/DejaVuSerifBold.xml'
+ embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifBold.ttf'>
+ <font-triplet name='DejaVuSerif' style='normal'
weight='bold'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSerifCondensed-Oblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed-Oblique.ttf'>
- <font-triplet name='DejaVuSerifCondensed'
style='italic' weight='normal'/>
+ metrics-file='/usr/share/fop/DejaVuSerifBoldItalic.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifBoldItalic.ttf'>
+ <font-triplet name='DejaVuSerif' style='italic'
weight='bold'/>
</font>
<font kerning='yes'
-
metrics-file='/usr/share/fop/DejaVuSerifCondensed-BoldOblique.xml'
-
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifCondensed-BoldOblique.ttf'>
- <font-triplet name='DejaVuSerifCondensed'
style='italic' weight='bold'/>
+ metrics-file='/usr/share/fop/DejaVuSerifItalic.xml'
+
embed-file='/usr/lib/X11/fonts/TTF/DejaVuSerifItalic.ttf'>
+ <font-triplet name='DejaVuSerif' style='italic'
weight='normal'/>
</font>
</fonts>
</configuration>
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
