Merge remote branch 'vm/master'

* vm/master:
  preseeding: adding partman/confirm_nooverwrite boolean true to prevent yet another question
  NF: fully (nearly) automated construction of VM image
  moving vm tools under vm/tools, deprecating nd_setupguestos replaced with vm/d-i/tools/initial_setup
  adding svgtune -- I doubt it would make to any task... although may be typesetting?
  Help with a smooth installation of Matlab
  Finally push it out to let people use the keyring package.
  Forgot *
  Put booth report link into publication section.
  Advertise donations.
  Minor
  minor touches on the SfN10 coverage
  SfN2010 booth report
  added nspike possible future blend
  Cleanup.
  blends-inject 0.0.5 release: NF: -a mode + BF: addressing Andreas comment on casing
  Rename spm8 doc addenum to match package name.
  Tweak NITRC setup for SPM8.
  Add spm8 (and reorder items).

diff --git a/live/auto/build b/live/auto/build
new file mode 100755 (executable)
index 0000000..03015cf
--- /dev/null
+++ b/live/auto/build
@@ -0,0 +1,2 @@
+#!/bin/sh
+lb build noauto ${@} 2>&1 | tee binary.log

diff --git a/live/auto/clean b/live/auto/clean
new file mode 100755 (executable)
index 0000000..1bc9ffb
--- /dev/null
+++ b/live/auto/clean
@@ -0,0 +1,6 @@
+#!/bin/sh
+lb clean noauto ${@}
+rm -f config/binary config/bootstrap \
+ config/chroot config/common config/source
+rm -f binary.log
+rm -f neurodebian-splash*

diff --git a/live/auto/config b/live/auto/config
new file mode 100755 (executable)
index 0000000..6f84280
--- /dev/null
+++ b/live/auto/config
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+set -eu
+
+# the Debian release to use as a basis for the live-cd
+nd_basedist="squeeze"
+nd_version="6.0.0"
+
+deb_mirror="http://debproxy:9999"
+
+# Prepare splash screen
+if [ ! -e neurodebian-splash.png ]; then
+    # For Grub2 it should be .tga;
+       # NOTE: RLE compression is not supported by imagemagick for write
+       xcf2png -o neurodebian-splash-big.png ../artwork/wallpaper_hotbrain.xcf
+       convert neurodebian-splash-big.png -crop 1400x1050+280 -geometry 640x480 \
+               neurodebian-splash.png
+fi
+
+# enable recommends for now since we care about 'typical' use patterns atm
+lb config noauto \
+  --apt apt \
+  --apt-recommends true \
+  --architecture i386 \
+  --archive-areas "main contrib non-free" \
+  --binary-images iso-hybrid \
+  --binary-indices none \
+  --bootstrap-flavour standard \
+  --debian-installer netinst \
+  --distribution ${nd_basedist} \
+  --hostname neurodebian \
+  --iso-application "NeuroDebian Live" \
+  --iso-preparer "NeuroDebian v.{nd_version}; http://neuro.debian.net" \
+  --iso-publisher "NeuroDebian project; http://neuro.debian.net" \
+  --keyring-packages "debian-archive-keyring neurodebian-keyring" \
+  --memtest memtest86+ \
+  --mirror-bootstrap "${deb_mirror}/debian/" \
+  --mirror-chroot "${deb_mirror}/debian/" \
+  --mirror-chroot-security "${deb_mirror}/security/" \
+  --packages-lists "nd-core nd-neuroimaging nd-neuroimaging-doc nd-electrphysiology nd-electrphysiology-doc" \
+  --repositories neuro.debian.net \
+  --security true \
+  --syslinux-splash neurodebian-splash.png \
+  --syslinux-timeout 10 \
+  --username brain \
+  --win32-loader enabled \
+  ${@}
+
+  # Leads to a stall... may be incorrect format
+  # seems to be KVM issue...
+
+  # --mirror-bootstrap "http://debian.lcs.mit.edu/debian/" \
+  # --packages-lists xfce \
+
+# May be
+# Deploy 1:1 copy of the running Live system
+# --debian-installer live
+
+# Would be nice to have it utterly useful, but rescue is too bloated, may be
+# at least forensics
+# --packages-lists
+
+# Do we need any of the additional tools from live.debian.net?
+#  --repositories live.debian.net \
+
+# Should we enable backports repo? then add
+#  debian-backports-keyring

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..9233102
--- /dev/null
+++ b/live/config/chroot_local-packageslists/nd-core.list
@@ -0,0 +1,15 @@
+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
+
+# Enable installer
+debian-installer-launcher
+
+# NeuroDebian specifics
+neurodebian-desktop

diff --git a/live/config/chroot_local-packageslists/nd-electrophysiology-doc.list b/live/config/chroot_local-packageslists/nd-electrophysiology-doc.list
new file mode 100644 (file)
index 0000000..46e2b8a
--- /dev/null
+++ b/live/config/chroot_local-packageslists/nd-electrophysiology-doc.list
@@ -0,0 +1 @@
+python-brian-doc

diff --git a/live/config/chroot_local-packageslists/nd-electrophysiology.list b/live/config/chroot_local-packageslists/nd-electrophysiology.list
new file mode 100644 (file)
index 0000000..f58705a
--- /dev/null
+++ b/live/config/chroot_local-packageslists/nd-electrophysiology.list
@@ -0,0 +1,3 @@
+sigviewer
+biosig-tools
+python-brian

diff --git a/live/config/chroot_local-packageslists/nd-neuroimaging-doc.list b/live/config/chroot_local-packageslists/nd-neuroimaging-doc.list
new file mode 100644 (file)
index 0000000..5038b3e
--- /dev/null
+++ b/live/config/chroot_local-packageslists/nd-neuroimaging-doc.list
@@ -0,0 +1,6 @@
+fslview-doc
+libnifti-doc
+libvia-doc
+lipsia-doc
+python-mvpa-doc
+python-nitime-doc

diff --git a/live/config/chroot_local-packageslists/nd-neuroimaging.list b/live/config/chroot_local-packageslists/nd-neuroimaging.list
new file mode 100644 (file)
index 0000000..ca46e8f
--- /dev/null
+++ b/live/config/chroot_local-packageslists/nd-neuroimaging.list
@@ -0,0 +1,15 @@
+afni
+ants
+amide caret dicomnifti
+fsl fsl-doc fslview fslview-doc
+itksnap
+lipsia via-bin
+minc-tools  mricron
+nifti-bin
+mrtrix
+odin praat
+python-mvpa python-nifti python-nipype python-nibabel python-nitime
+psychopy
+slicer
+voxbo
+xmedcon

diff --git a/live/config/repositories/neuro.debian.net b/live/config/repositories/neuro.debian.net
new file mode 100644 (file)
index 0000000..f7ddad1
--- /dev/null
+++ b/live/config/repositories/neuro.debian.net
@@ -0,0 +1,9 @@
+# NeuroDebian Software
+deb http://neuro.debian.net/debian @DISTRIBUTION@ @ARCHIVE_AREAS@
+#deb http://neuro.debian.net/debian @DISTRIBUTION@ @ARCHIVE_AREAS@
+
+# NeuroDebian Data
+deb http://neuro.debian.net/debian data @ARCHIVE_AREAS@
+#deb-src http://neuro.debian.net/debian data @ARCHIVE_AREAS@
+
+

diff --git a/live/config/repositories/neuro.debian.net.gpg b/live/config/repositories/neuro.debian.net.gpg
new file mode 120000 (symlink)
index 0000000..fddc155
--- /dev/null
+++ b/live/config/repositories/neuro.debian.net.gpg
@@ -0,0 +1 @@
+../../../keys/neurodebian-archive-keyring.gpg
\ No newline at end of file

diff --git a/tools/makelivecd.sh b/tools/makelivecd.sh
deleted file mode 100644 (file)
index 97d1a63..0000000
--- a/tools/makelivecd.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!bin/sh
-
-set -e
-
-# for a fresh build one might want to run:
-# sudo rm -rf cache/stages_bootstrap chroot/ config/ scripts/ binary* .stage
-
-# the Debian release to use as a basis for the live-cd
-nd_basedist="lenny"
-# the NeuroDebian archive key
-nd_key="A5D32F012649A5A9"
-# packages to be installed
-nd_packages="\
-amide caret dicomnifti \
-fsl fsl-doc fslview fslview-doc \
-iceweasel \
-lipsia lipsia-doc via-bin \
-minc-tools nifti-bin odin praat \
-python-mvpa python-nifti python-pyepl \
-xmedcon"
-
-
-lh_config \
-  --apt apt \
-  --apt-recommends disabled \
-  --architecture i386 \
-  --binary-images iso \
-  --binary-indices none \
-  --bootstrap-flavour minimal \
-  --categories "main contrib non-free" \
-  --debian-installer disabled \
-  --distribution ${nd_basedist} \
-  --hostname debian \
-  --iso-application NeuroDebian \
-  --iso-publisher "NeuroDebian; http://neuro.debian.org" \
-  --mirror-bootstrap "http://debian.lcs.mit.edu/debian/" \
-  --packages-lists xfce \
-  --packages "${nd_packages}" \
-  --username neuro \
-  --win32-loader enabled
-
-# add the NeuroDebian repository to the APT setup
-echo "deb http://neuro.debian.net/debian ${nd_basedist} main contrib non-free" \
-    > config/chroot_sources/neurodebian.chroot
-cp config/chroot_sources/neurodebian.chroot config/chroot_sources/neurodebian.binary
-# and the key
-gpg --export -a ${nd_key} > config/chroot_sources/neurodebian.chroot.gpg
-cp config/chroot_sources/neurodebian.chroot.gpg config/chroot_sources/neurodebian.binary.gpg
-
-
-# use NeuroDebian package cache
-if [ ! -e "cache/packages_bootstrap" ]; then
-  mkdir -p cache
-  ln -s ../../debian_aptcache/ cache/packages_bootstrap
-fi