Commit a1f539a7 authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin

regular.mk, pkg.in/lists: drop ConsoleKit

This one conflicts with systemd-logind; so let's move it from generic pkglists into specific regular.mk targets (those based on distro/.regular-sysv).
parent c4f9521e
...@@ -37,9 +37,10 @@ distro/.regular-desktop: distro/.regular-wm \ ...@@ -37,9 +37,10 @@ distro/.regular-desktop: distro/.regular-wm \
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \ distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
use/x11/gdm2.20; @: use/x11/gdm2.20; @:
distro/.regular-sysv: distro/.regular-wm +sysvinit
@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)
distro/.regular-install: distro/.regular-base +installer +sysvinit +power \ distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks \ use/branding use/bootloader/grub use/luks \
......
cinnamon-regular cinnamon-regular
installer-feature-xdg-user-dirs installer-feature-xdg-user-dirs
ConsoleKit
...@@ -2,4 +2,3 @@ e17-default ...@@ -2,4 +2,3 @@ e17-default
evas_generic_loaders evas_generic_loaders
gnome-icon-theme gnome-icon-theme
terminology terminology
ConsoleKit
...@@ -3,4 +3,3 @@ evas_generic_loaders ...@@ -3,4 +3,3 @@ evas_generic_loaders
gnome-icon-theme gnome-icon-theme
rage rage
xterm xterm
ConsoleKit
...@@ -24,6 +24,3 @@ lxde-settings-lxdesktop ...@@ -24,6 +24,3 @@ lxde-settings-lxdesktop
lxde-icon-theme lxde-icon-theme
tango-icon-theme tango-icon-theme
# reboot/poweroff in logout menu as of July, 2013
ConsoleKit
...@@ -39,6 +39,3 @@ psi-plus-plugin-birthdayreminder ...@@ -39,6 +39,3 @@ psi-plus-plugin-birthdayreminder
psi-plus-plugin-conferencelogger psi-plus-plugin-conferencelogger
psi-plus-plugin-screenshot psi-plus-plugin-screenshot
psi-plus-plugin-watcher psi-plus-plugin-watcher
# reboot/poweroff in logout menu as of May, 2014
ConsoleKit
...@@ -7,9 +7,6 @@ fonts-otf-mozilla-fira ...@@ -7,9 +7,6 @@ fonts-otf-mozilla-fira
xdg-user-dirs xdg-user-dirs
#gnome-minimal #gnome-minimal
#gnome-mobile #gnome-mobile
ConsoleKit
ConsoleKit-x11
pam-ck-connector
notification-daemon notification-daemon
#powermgmt-base #powermgmt-base
acpi acpi
......
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