re-enable gnome (as gnome-core) to make our lives easier

diff --git a/live/auto/config b/live/auto/config
index eb39510e258a35f65a907dab62ed6963378ca176..accb4ecfbab34ed9beb2b9195c500f48174f34cf 100755 (executable)
--- a/live/auto/config
+++ b/live/auto/config
@@ -36,7 +36,7 @@ lb config noauto \
   --mirror-bootstrap "${deb_mirror}/debian/" \
   --mirror-chroot "${deb_mirror}/debian/" \
   --mirror-chroot-security "${deb_mirror}/security/" \
-  --packages-lists "nd-basic nd-neuroimaging nd-electrphysiology" \
+  --packages-lists "nd-core nd-neuroimaging nd-electrphysiology" \
   --repositories neuro.debian.net \
   --security true \
   --syslinux-timeout 10 \

diff --git a/live/config/chroot_local-packageslists/nd-basic.list b/live/config/chroot_local-packageslists/nd-basic.list
deleted file mode 100644 (file)
index 09da214..0000000
--- a/live/config/chroot_local-packageslists/nd-basic.list
+++ /dev/null
@@ -1,10 +0,0 @@
-gnome-core mc evince bash-completion ntpdate file-roller gnome-utils
-gnome-themes eog vim
-software-center gdebi gedit-plugins gnome-media synaptic menu less
-
-#if ARCHIVE_AREAS non-free
-firmware-linux-nonfree
-#endif
-
-# NeuroDebian specifics
-neurodebian-desktop

diff --git a/live/config/chroot_local-packageslists/nd-core.list b/live/config/chroot_local-packageslists/nd-core.list
new file mode 100644 (file)
index 0000000..ed1656a
--- /dev/null
+++ b/live/config/chroot_local-packageslists/nd-core.list
@@ -0,0 +1,12 @@
+gnome-core mc evince bash-completion ntpdate file-roller gnome-utils
+gnome-themes eog vim
+software-center gdebi gedit-plugins gnome-media synaptic menu less
+
+#include <gnome-core>
+
+#if ARCHIVE_AREAS non-free
+firmware-linux-nonfree
+#endif
+
+# NeuroDebian specifics
+neurodebian-desktop