From: Michael Hanke <michael.hanke@gmail.com>
Date: Wed, 21 Jul 2010 12:44:14 +0000 (-0400)
Subject: Merge remote branch 'alioth/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1bd7eccf2b77b779e32e7a2e1081358615db9e47;p=neurodebian.git

Merge remote branch 'alioth/master'

* alioth/master:
  adding MLPY to nd
  added mipav and jist NITRC IDs to neurodebian.cfg
  Added Maverick, us-tn mirror, us -> us-nh (placed first in note), fixed typo
  adding nd+ubuntu maverick
  extending list of available distributions
---

1bd7eccf2b77b779e32e7a2e1081358615db9e47
diff --cc neurodebian.cfg
index cbc092a,d05264b..11b998d
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@@ -11,9 -11,9 +11,9 @@@ select taskfiles 
  
  # Additional selection filter (similar to 'select taskfiles'), only listing
  # package names
 -select names = libnifti1 odin mitools afni-atlases python-pyssdh python-networkx
 +select names = libnifti2 odin mitools afni-atlases python-pyssdh python-networkx
   r-cran-glmnet python-rpy2 python-nibabel-snapshot
-  python-scikits-learn python-mdp
+  python-scikits-learn python-mdp python-mlpy
  
  # Information about prospective packages to be imported from taskfiles
  prospective =