From: Michael Hanke <michael.hanke@gmail.com>
Date: Fri, 29 Apr 2011 14:27:57 +0000 (-0400)
Subject: Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=74839d56c495ae7686c25d05423388dfac310998;hp=7b29bf660e6cca4f9f5b86b9dd76fd561ae572d7;p=neurodebian.git

Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian

* 'master' of alioth:/git/pkg-exppsy/neurodebian:
  BF: pull in scipy instead of only numpy for Scientific Python
---

diff --git a/cmdsettings.sh b/cmdsettings.sh
index 521d589..1dc6a9d 100644
--- a/cmdsettings.sh
+++ b/cmdsettings.sh
@@ -7,7 +7,7 @@ buildplace="${cowbuilderroot}/build"
 
 # all cuurently supported dists
 allnddists="nd+debian-lenny nd+debian-squeeze nd+debian-wheezy nd+debian-sid \
-            nd+ubuntu-maverick nd+ubuntu-lucid nd+ubuntu-karmic nd+ubuntu-hardy"
+            nd+ubuntu-natty nd+ubuntu-maverick nd+ubuntu-lucid nd+ubuntu-karmic nd+ubuntu-hardy"
 alldists="$allnddists debian-lenny debian-squeeze debian-wheezy debian-sid"
 
 # default is debian
diff --git a/debian/changelog b/debian/changelog
index b91d3a6..0b319c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+neurodebian (0.25) unstable; urgency=low
+
+  * Various improvements to the webportal.
+  * Support for Ubuntu natty
+
+ -- Michael Hanke <mih@debian.org>  Fri, 29 Apr 2011 09:19:15 -0400
+
 neurodebian (0.24) unstable; urgency=low
 
   * Tuning up VM setup
diff --git a/debian/control b/debian/control
index 32aa130..746ea0d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: neurodebian
 Section: science
 Priority: optional
 Maintainer: NeuroDebian Team <team@neuro.debian.net>
-Uploaders: Michael Hanke <michael.hanke@gmail.com>, Yaroslav Halchenko <debian@onerussian.com>
+Uploaders: Michael Hanke <mih@debian.org>, Yaroslav Halchenko <debian@onerussian.com>
 Build-Depends: debhelper (>= 7.0.50~), xcftools, help2man, inkscape, imagemagick, python-html5lib
 Standards-Version: 3.9.1
 Homepage: http://neuro.debian.net
diff --git a/neurodebian.cfg b/neurodebian.cfg
index 9af5411..ca39a82 100644
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -101,7 +101,9 @@ lucid = Ubuntu 10.04 LTS "Lucid Lynx" (lucid)
 # EOL: April 2012
 maverick = Ubuntu 10.10 "Maverick Meerkat" (maverick)
 # EOL: October 2012
-natty = Upcoming Ubuntu 11.04 "Natty Narwhal" (natty)
+natty = Ubuntu 11.04 "Natty Narwhal" (natty)
+# EOL: 
+oneiric = Upcoming Ubuntu 11.10 "Oneiric Ocelot" (oneiric)
 
 [release backport ids]
 # the purpose of these ids is to have version suffixes for backported packages
@@ -121,6 +123,7 @@ karmic = nd09.10
 lucid = nd10.04
 maverick = nd10.10
 natty = nd11.04
+oneiric = nd11.10
 
 [nitrc ids]
 afni = 23