Merge branch 'master' into newdesign

[neurodebian.git] / neurodebian.cfg

diff --git a/neurodebian.cfg b/neurodebian.cfg
index 6eaad4e3221e6a9daad1ae5c04c0bce066f3f4c7..ad6c5e63a32e573713c7007f1678833fc4dc8e5e 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -22,7 +22,8 @@ select names = libnifti2 odin mitools afni-atlases python-pyssdh python-networkx
  r-cran-glmnet python-rpy2 python-nibabel-snapshot
  python-sklearn python-scikits-learn python-mdp python-mlpy python-openpyxl libgdf-dev matlab-support
  svgtune rorden-mri-tutorial caret-data python-joblib python-sphinx fail2ban
- python-pandas neurodebian numdiff nuitka pytables
+ python-pandas python-skimage neurodebian numdiff nuitka pytables
+ guacamole freeipmi remake
 
 # Information about prospective packages to be imported from taskfiles
 prospective =
@@ -61,10 +62,13 @@ openwalnut = openwalnut-qt4
 neurodebian = neurodebian-dev neurodebian-desktop neurodebian-keyring neurodebian-popularity-contest neurodebian-guest-additions
 pytables = python-tables
 isis = isis-utils libisis-core-dev python-isis libisis-ioplugins-common libisis-ioplugins-dicom libisis-qt4-dev
+guacamole = guacamole guacd libguac-dev libguac3 libguac-client-rdp guacamole-tomcat libguac-client-vnc0
+neo = python-neo
 
 [mirrors]
 au = http://mirror.aarnet.edu.au/pub/neurodebian
-de = http://apsy.gse.uni-magdeburg.de/debian
+de-md = http://apsy.gse.uni-magdeburg.de/debian
+de-v = http://nd.zetatech.org
 gr = http://neurobot.bio.auth.gr/neurodebian
 jp = http://neuroimaging.sakura.ne.jp/neurodebian
 ua = http://www.neuro.webdisk.com.ua
@@ -74,7 +78,8 @@ us-tn = http://masi.vuse.vanderbilt.edu/neurodebian
 
 [mirror names]
 au = Australia (AARNET)
-de = Germany (University of Magdeburg)
+de-md = Germany (University of Magdeburg)
+de-v = Germany (Nikolaus Valentin Haenel, Vogtland)
 gr = Greece (Aristotle University of Thessaloniki)
 jp = Japan (Kiyotaka Nemoto)
 ua = Ukraine (Iaroslav Iurchenko)
@@ -95,7 +100,6 @@ releases =
  http://neuro.debian.net/debian/dists/natty/Release
  http://neuro.debian.net/debian/dists/oneiric/Release
  http://neuro.debian.net/debian/dists/precise/Release
- http://neuro.debian.net/debian/dists/lenny/Release
  http://neuro.debian.net/debian/dists/squeeze/Release
  http://neuro.debian.net/debian/dists/wheezy/Release
  http://neuro.debian.net/debian/dists/sid/Release