Commit 3b35a8f4 authored by Michael Shigorin's avatar Michael Shigorin

exterminate fonts-ttf-dejavu all over the place

It looks *ugly* on-screen, at least within regular builds, even if the screen is 166dpi. Based on a quick experiment this morning I'd suggest using fonts-otf-adobe-source-{code,sans}-pro instead -- and it's available as use/fonts/otf/adobe now, incidentally. The documentation is still built with it though as a2x/fop look unhappy otherwise (as in replacing Cyrillic glyphs with "#"s).
parent 362fd3f0
......@@ -45,14 +45,13 @@ vm/.cubox-bare: vm/.arm-base use/armh-cubox use/net-ssh use/repo use/tty/S0
@$(call add,BASE_PACKAGES,glibc-locales vim-console rsync)
vm/.cubox-desktop: vm/.cubox-bare use/armh-dovefb +systemd +pulse \
use/armh-cubox use/branding use/xdg-user-dirs/deep
use/armh-cubox use/branding use/xdg-user-dirs/deep \
use/fonts/otf/adobe use/fonts/ttf/redhat use/fonts/ttf/ubuntu
@$(call set,BRANDING,altlinux-kdesktop)
@$(call add,THE_BRANDING,alterator graphics indexhtml menu notes)
@$(call add,BASE_PACKAGES,parole gst-ffmpeg gst-plugins-vmeta)
@$(call add,BASE_PACKAGES,gst-plugins-good gst-plugins-nice)
@$(call add,BASE_PACKAGES,gst-plugins-bad gst-plugins-ugly)
@$(call add,BASE_PACKAGES,fonts-ttf-droid fonts-ttf-ubuntu-font-family)
@$(call add,BASE_PACKAGES,fonts-ttf-liberation fonts-ttf-dejavu)
@$(call add,BASE_PACKAGES,LibreOffice4-full LibreOffice4-langpack-ru)
@$(call add,BASE_LISTS,$(call tags,(base || desktop) && regular))
......
......@@ -16,9 +16,9 @@ distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
use/plymouth/live; @:
distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
distro/.live-kiosk: distro/.base use/live/base use/live/autologin +power \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu)
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
use/fonts/otf/adobe +power
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
distro/live-builder-mini: distro/.live-base use/dev/mkimage use/dev \
......
......@@ -33,10 +33,10 @@ endif
# graphical target (not enforcing xorg drivers or blobs)
use/live/x11: use/live/base use/syslinux/localboot.cfg \
use/deflogin/desktop use/x11-autologin use/sound +power +efi
use/deflogin/desktop use/x11-autologin use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla +power +efi
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_LISTS,$(call tags,base l10n))
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-otf-mozilla-fira)
@$(call add,LIVE_PACKAGES,pciutils)
# this target specifically pulls free xorg drivers in (and a few more bits);
......
......@@ -26,10 +26,11 @@ altlinux-freedesktop-menu-shallow-menu
altlinux-freedesktop-menu-icon-theme-default
docs-simply-linux
docs-linux_intro
fonts-otf-adobe-source-code-pro
fonts-otf-adobe-source-sans-pro
fonts-ttf-droid
fonts-ttf-ubuntu-font-family
fonts-ttf-liberation
fonts-ttf-dejavu
fonts-ttf-ubuntu-font-family
gnome-system-monitor
gnome-icon-theme
......
......@@ -8,10 +8,11 @@ altlinux-freedesktop-menu-icon-theme-default
#altlinux-freedesktop-menu-common
docs-simply-linux
docs-linux_intro
fonts-otf-adobe-source-code-pro
fonts-otf-adobe-source-sans-pro
fonts-ttf-droid
fonts-ttf-ubuntu-font-family
fonts-ttf-liberation
fonts-ttf-dejavu
fonts-ttf-ubuntu-font-family
gnome-system-monitor
gnome-icon-theme
#tango-icon-theme
......
......@@ -5,7 +5,8 @@ xauth
twofing
setxkbmap
fonts-ttf-dejavu
fonts-otf-adobe-source-code-pro
fonts-otf-adobe-source-sans-pro
fonts-otf-mozilla-fira
rfkill
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment