From f57759d6dcb89a4be44f4c556062ca82b5fc3d78 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 12 Apr 2012 01:01:40 +0300 Subject: [PATCH] initial cinnamon support and livecd Thanks slava@ for the packages and inspiration, and aris@ for the useful advice and fixups. --- conf.d/live.mk | 3 +++ features.in/x11/config.mk | 3 +++ pkg.in/lists/tagged/desktop+cinnamon | 2 ++ pkg.in/lists/tagged/desktop+cinnamon+extra | 3 +++ 4 files changed, 11 insertions(+) create mode 100644 pkg.in/lists/tagged/desktop+cinnamon create mode 100644 pkg.in/lists/tagged/desktop+cinnamon+extra diff --git a/conf.d/live.mk b/conf.d/live.mk index 22d7de05..c7ef82af 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -56,4 +56,7 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary distro/live-simply: distro/livecd-install use/slinux use/systemd \ use/firmware/wireless use/x11/drm use/x11/3d-proprietary; @: +distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \ + use/x11/cinnamon use/x11/3d-free + endif diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index a48cf490..c0a7b159 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -49,3 +49,6 @@ use/x11/tde: use/x11/xorg use/x11/xfce: use/x11/xorg @$(call add,THE_LISTS,$(call tags,xfce desktop)) + +use/x11/cinnamon: use/x11/xorg use/x11/drm + @$(call add,THE_LISTS,$(call tags,cinnamon desktop)) diff --git a/pkg.in/lists/tagged/desktop+cinnamon b/pkg.in/lists/tagged/desktop+cinnamon new file mode 100644 index 00000000..c3ece951 --- /dev/null +++ b/pkg.in/lists/tagged/desktop+cinnamon @@ -0,0 +1,2 @@ +cinnamon-default +installer-feature-xdg-user-dirs diff --git a/pkg.in/lists/tagged/desktop+cinnamon+extra b/pkg.in/lists/tagged/desktop+cinnamon+extra new file mode 100644 index 00000000..ce00f206 --- /dev/null +++ b/pkg.in/lists/tagged/desktop+cinnamon+extra @@ -0,0 +1,3 @@ +gnome3-default +libreoffice libreoffice-gnome libreoffice-langpack-ru +gimp