summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-10 15:11:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-10 15:11:28 +0000
commitf055c101a7a35a0d5e9e3ec885486fa16141f9fb (patch)
tree9256ac516e45737291263228d78949782f893d1d
parentc5a4057fc323c758ca1a9f26bb230dbe9c6e6dfb (diff)
downloaddrakx-backup-do-not-use-f055c101a7a35a0d5e9e3ec885486fa16141f9fb.tar
drakx-backup-do-not-use-f055c101a7a35a0d5e9e3ec885486fa16141f9fb.tar.gz
drakx-backup-do-not-use-f055c101a7a35a0d5e9e3ec885486fa16141f9fb.tar.bz2
drakx-backup-do-not-use-f055c101a7a35a0d5e9e3ec885486fa16141f9fb.tar.xz
drakx-backup-do-not-use-f055c101a7a35a0d5e9e3ec885486fa16141f9fb.zip
- add vera fonts (normal and bold)
- generate fonts.dir and fonts.cache-1 - take cursor.pcf.gz from system
-rw-r--r--perl-install/Makefile4
-rw-r--r--perl-install/lang.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index a62d4217a..221ba4d9e 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -182,6 +182,10 @@ endif
for i in fonts keyboards locales-skeleton keymaps; do tar xfj share/$$i.tar.bz2 -C $(DEST); done
+ cp /usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz /usr/share/fonts/ttf/vera/{Vera,VeraBd}.ttf $(DEST)/usr/X11R6/lib/X11/fonts
+ mkfontdir $(DEST)/usr/X11R6/lib/X11/fonts
+ fc-cache -f $(DEST)/usr/X11R6/lib/X11/fonts
+
grep ChangeLog CVS/Entries > $(STAGE2_DEST)/VERSION
gzip -9f $(DEST)/usr/share/ldetect-lst/*
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 0b6b7d091..6b7d0dca4 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -844,7 +844,7 @@ my %charset2pango_font = (
#- Nimbus Sans L is missing some chars used by some cyrillic languages,
#- but tose have not yet DrakX translations; it also misses vietnamese
#- latin chars; all other latin and cyrillic are covered.
- 'default' => "Nimbus Sans L 12"
+ 'default' => "Sans 12"
);
sub charset2pango_font {