Yet another round of configuration enhancement

diff --git a/neurodebian.cfg b/neurodebian.cfg
index 48a3bb49a39b23d4aa076f8345fecdba90ee7990..c34bfb572ea30c46ebd7eb7ed48b1bbbc6a08153 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -115,8 +115,8 @@ source extracts filenames = upstream README.Debian copyright
 # list of environments to build for: each item in this space-separated list
 # is a tuple of a build family ID and a release name joined by a dash, e.g.
 # debian-sid
-environments = nd+debian-sid nd+debian-wheezy
-
+environments = nd+debian-sid nd+debian-jessie nd+debian-wheezy nd+debian-squeeze
+  nd+ubuntu-raring nd+ubuntu-quantal nd+ubuntu-precise nd+ubuntu-lucid
 # what command to use for package building: pbuilder or cowbuilder
 builder = pbuilder
 
@@ -150,14 +150,17 @@ archall architecture = amd64
 
 # main mirror for chroots
 nd+debian mirror = http://medusa:3142/http.debian.net/debian
+nd+ubuntu mirror = http://medusa:3142/archive.ubuntu.com/ubuntu
 
 # additional mirror(s) for the chroot (thay take precedence over the main mirror
 # the release codename is automatically filled in where '%%(release)s' is given
 nd+debian othermirror = deb http://medusa:3142/neurodebian.ovgu.de/debian %%(release)s main contrib non-free
+nd+ubuntu othermirror = deb http://medusa:3142/neurodebian.ovgu.de/debian %%(release)s main contrib non-free
 
 # additional keyring to be used by debbootstrap and APT
-#nd+debian bootstrap keyring =
+nd+ubuntu bootstrap keyring = /usr/share/keyrings/ubuntu-archive-keyring.gpg
 nd+debian keyring = ~/tools/neurodebian/keys/neurodebian-archive-keyring.gpg
+nd+ubuntu keyring = ~/tools/neurodebian/keys/neurodebian-archive-keyring.gpg
 
 # Repository components to enable in a build chroot
 #components=
@@ -165,15 +168,19 @@ debian components = main
 nd+debian components = main contrib non-free
 nd+ubuntu components = main universe multiverse
 
+# force including sources in any build (for one arch in a batch)
+nd+debian source include = yes
+nd+ubuntu source include = yes
+
 # Maintainer setting for backported packages
-backport maintainer = NeuroDebian Maintainers <team@neuro.debian.net>
+backport maintainer = NeuroDebian Team <team@neuro.debian.net>
 
 # sed expression for modifying the control file of backported packages
 backport modify control = s/\(^Depends:\) */\1 neurodebian-popularity-contest, /g
 
 # space-separate list of source package name for which to NOT apply the control
 # modification expression
-backport modify control blacklist = fslmeta
+backport modify control blacklist =
 
 [release backport ids]
 # IDs for individual releases that are used as version suffixes when