Properly handle multi-arch builds.

diff --git a/tools/nd_build b/tools/nd_build
index 08ac6e2fcee0f1ca2cf8917394ae13aaba84c320..9f2ca6ee77913b49edfff6c267c522cd05250b41 100755 (executable)
--- a/tools/nd_build
+++ b/tools/nd_build
@@ -78,10 +78,18 @@ else
 fi
 
 for a in $arch; do
+  if [ "$a" = "amd64" ]; then
+    # only force source into the upload for NeuroDebian
+    if [ ! "$family" = "${family#nd+*}" ]; then
+      options="$opts --debbuildopts -sa"
+    fi
+  else
+    options="$opts --debbuildopts -B"
+  fi
   echo "Building for $family $dist $a ..."
   cowbuilder --build $dscfile \
              --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow \
              --buildresult . \
-             $opts \
+             $options \
              $*
 done