From d03838dd2c03d159a3a81b428c4bde205ff24b52 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 31 Oct 2016 22:01:59 +0300 Subject: [PATCH] basealt.mk: update trademark We don't use BaseALT(tm) for 8.1+ distributions anymore having standardized on ALT(tm) for good; update strings accordingly. --- conf.d/basealt.mk | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk index 7bc10bfc..6af30699 100644 --- a/conf.d/basealt.mk +++ b/conf.d/basealt.mk @@ -1,6 +1,6 @@ ifeq (distro,$(IMAGE_CLASS)) -distro/basealt-workstation: workstation_groups = $(addprefix workstation/,\ +distro/alt-workstation: workstation_groups = $(addprefix workstation/,\ 10-office 20-networking 30-multimedia 40-virtualization 50-publishing \ blender emulators gnome-peer-to-peer graphics-editing \ gtk-dictionary libreoffice mate-usershare pidgin remmina \ @@ -8,7 +8,7 @@ distro/basealt-workstation: workstation_groups = $(addprefix workstation/,\ freecad ganttproject thunderbird \ kvm virtualbox) -distro/basealt-workstation: distro/.base use/luks \ +distro/alt-workstation: distro/.base use/luks \ +installer +sysvinit +power +systemd +pulse +vmguest +wireless +efi \ use/kernel/net use/docs/license \ use/vmguest use/memtest \ @@ -66,19 +66,16 @@ distro/basealt-workstation: distro/.base use/luks \ @$(call add,BASE_KMODULES,kvm virtualbox) @$(call add,THE_KMODULES,staging) @$(call add,THE_BRANDING,mate-settings) - @$(call set,BRANDING,basealt-workstation) + @$(call set,BRANDING,alt-workstation) @$(call set,INSTALLER,altlinux-desktop) - @$(call set,DOCS,basealt-desktop) + @$(call set,DOCS,alt-workstation) @$(call add,RESCUE_BOOTARGS,nomodeset vga=0) @$(call add,CONTROL,xdg-user-dirs:enabled) @$(call add,SERVICES_ENABLE,cups smb nmb httpd2) @$(call add,DEFAULT_SERVICES_DISABLE,powertop) @$(call set,META_PUBLISHER,BaseALT Ltd) - @$(call set,META_VOL_SET,BaseALT) - @$(call set,META_VOL_ID,BaseALT Workstation) - @$(call set,META_APP_ID,8.0/$(ARCH)) - -distro/alt-workstation: distro/basealt-workstation - @$(call set,BRANDING,alt-workstation) + @$(call set,META_VOL_SET,ALT) + @$(call set,META_VOL_ID,ALT Workstation) + @$(call set,META_APP_ID,8.1/$(ARCH)) endif