Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/pkg-exppsy/neurodebian:
  Mention squeeze as stable and wheezy as the new testing.

diff --git a/cmdsettings.sh b/cmdsettings.sh
index 7ffff037862658379ed21f275f2dd48a060a1f67..d7c2afcc773017c288e1c07d5d3b6a7812a7b936 100644 (file)
--- a/cmdsettings.sh
+++ b/cmdsettings.sh
@@ -6,9 +6,9 @@ cowbuilderroot="/home/neurodebian"
 buildplace="${cowbuilderroot}/build"
 
 # all cuurently supported dists
-allnddists="nd+debian-lenny nd+debian-squeeze nd+debian-sid \
+allnddists="nd+debian-lenny nd+debian-squeeze nd+debian wheezy nd+debian-sid \
             nd+ubuntu-maverick nd+ubuntu-lucid nd+ubuntu-karmic nd+ubuntu-jaunty"
-alldists="$allnddists debian-lenny debian-squeeze debian-sid"
+alldists="$allnddists debian-lenny debian-squeeze debian-wheezy debian-sid"
 
 # default is debian
 aptcache="${cowbuilderroot}/debian_aptcache"

diff --git a/neurodebian.cfg b/neurodebian.cfg
index bb7596cef645a54649df691f40faa77a79d616e7..891d0079f45693aa76e2fe402cb1cdb9ce011ee7 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -79,9 +79,8 @@ releases =
 data = Datasets
 etch = Debian GNU/Linux 4.0 (etch)
 lenny = Debian GNU/Linux 5.0 (lenny)
-squeeze = Debian testing (squeeze)
-#squeeze = Debian 6.0 (squeeze)
-#wheezy = Debian testing (wheezy)
+squeeze = Debian GNU/Linux 6.0 (squeeze)
+wheezy = Debian testing (wheezy)
 sid = Debian unstable (sid)
 #dapper = Ubuntu 06.06 LTS "Dapper Drake" (dapper)
 #edgy = Ubuntu 06.10 "Edgy Eft" (edgy)