From: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri, 7 Dec 2012 18:03:04 +0000 (-0500)
Subject: Merge branch 'master' into enh/wheezy-vm
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a5724e8f5d3a4541adc9a7727e28ac46fbd54fe8;p=neurodebian.git

Merge branch 'master' into enh/wheezy-vm

* master: (32 commits)
  ENH: nd_build_testrdepends -- sign the temporary repository with the package (use apt-ftparchive)
  ENH: Make neurodebian.cfg also visible on the website so we could easily fetch up-to-date version if needed
  ENH: improved nd_querycfg a bit: query content of a section or list of sections
  Changes for Lin4Neuro from Kiyotaka Nemoto
  Thomas's suggested description for the mirror
  Remove umlaut's from de-m mirror name -- breaks the build
  Added de-m mirror (INCF G-Node), Thanks Thomas Wachtler
  alias for openvibe
  Adding ubuntu quantal (nd12.10) into "supported"
  little TODO in nd_createappliance on preseeding solution
  brochure -- very minor from native speakers
  more items and a bit of indentation -- printing now
  added rudimentary README.txt on how to build brochure
  updated VM page for 6.0.6 (with the date when VM was wrapped on 1st of Oct)
  add remake to give it a page
  changelog + nd-vmsetupwizard: Preparing 0.29 release of neurodebian for updated nd-vmsetupwizard
  Make ymax dynamic (5% above current max value), per each distribution + labels for every other month
  A slight overhaul of the brochure -- nothing radical but at least it is up to date now
  injected spykeview
  BF: added an alias for neo (python-neo)
  ...

Conflicts:
	tools/nd-vmsetupwizard
	vm/tools/nd_createappliance
---

a5724e8f5d3a4541adc9a7727e28ac46fbd54fe8
diff --cc tools/nd-vmsetupwizard
index c889a04,496ccf1..337b4bb
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@@ -116,14 -117,17 +117,16 @@@ Please note that this selection will no
  on the system. No installed packages will be reinstalled or removed, only
  additional components will be installed." \
  FALSE "Emacs" "emacs" \
- FALSE "GNU Image Manipulation Program (Gimp)" "gimp" \
+ FALSE "Graphics (e.g. GIMP, Inscape)" "gimp,inkscape,svgtune,xzgv,vym" \
  FALSE "Octave" "octave,qtoctave" \
  FALSE "OpenOffice.org" "openoffice.org" \
- FALSE "PyMVPA" "ipython,python-mvpa2,python-mvpa2-doc,spyder" \
+ FALSE "PyMVPA Tutorial" "ipython01x,python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorialdata,spyder" \
+ FALSE "Python: Electrophysiology & Modeling" "python-brian,python-pynn,python-pyentropy,stimfit" \
+ FALSE "Python: Neuroimaging" "ipython01x,spyder,nipy-suite,python-mvpa2" \
+ FALSE "Python: Scientific stack" "ipython01x,spyder,python-matplotlib,python-pandas,python-sympy" \
  FALSE "R" "r-recommended" \
- FALSE "Scientific Python" "ipython,python-scipy,python-matplotlib,spyder,python-pandas" \
  FALSE "TeX Live" "texlive" \
  FALSE "Adobe Flash browser plugin" "flashplugin-nonfree" \
 -FALSE "Sun Java browser plugin" "sun-java6-plugin" \
  || true)
  
  if [ -n "$packages" ]; then
diff --cc vm/tools/nd_createappliance
index 593c315,fd4cbdf..9e21abc
--- a/vm/tools/nd_createappliance
+++ b/vm/tools/nd_createappliance
@@@ -182,16 -132,12 +182,20 @@@ _info "Run Debian Installer
  # type  auto url=$di_host
  # press Enter"
  
 +# start local web server to serve preseed file
 +builtin cd $(dirname ${di_preseed})
 +python -m SimpleHTTPServer ${di_port} >&/dev/null &
 +di_pid=$!
 +builtin cd -
 +
 +
 +
  VBoxManage startvm "${vm_name}"
  
+ # TODO: see if we could just use virtinst (virt-install tool) to run d-i
+ #       with pre-seeding without this hackery.  See
+ #       http://honk.sigxcpu.org/con/Preseeding_Debian_virtual_machines_with_virt_install.html
+ #       for an example
  sleep 5                         # give some time to make sure we get to menu
  # Send our sequence -- cruel way
  #VBoxManage controlvm "${vm_name}" keyboardputscancode \