Add aptitude for all regulars, except jeos

conf.d/mixin.mk

@@ -145,7 +145,7 @@ mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \
 mixin/regular-builder: use/dev/builder/base use/net-eth/dhcp use/ntp/chrony
 	@$(call add,THE_PACKAGES,bash-completion elinks gpm lftp openssh)
 	@$(call add,THE_PACKAGES,rpm-utils screen tmux wget zsh)
-	@$(call add,THE_PACKAGES,apt-repo eepm)
+	@$(call add,THE_PACKAGES,apt-repo aptitude eepm)
 	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)
 
 ### vm.mk

conf.d/regular.mk

@@ -183,7 +183,7 @@ distro/.regular-server: distro/.regular-server-base \
 	use/server/mini use/firmware/qlogic use/rescue/base \
 	use/ntp/chrony use/cleanup/libs use/bootloader/grub +efi
 	@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
-	@$(call add,MAIN_PACKAGES,aptitude)
+	@$(call add,BASE_PACKAGES,aptitude)
 	@$(call add,CLEANUP_PACKAGES,qt4-common qt5-base-common)
 	@$(call add,DEFAULT_SERVICES_DISABLE,bridge)
 	@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)

pkg.in/lists/tagged/base+regular

@@ -35,6 +35,7 @@ dmidecode@X86
 apt-repo
 apt-rsync
 apt-scripts
+aptitude
 update-kernel
 eepm
 

pkg.in/lists/tagged/base+rescue

@@ -14,6 +14,7 @@ eject
 
 # Package management
 apt-repo
+aptitude
 
 # Partition management
 fdisk