BF: fix building debian packages on ubuntu

As discussed in the thread:

http://lists.alioth.debian.org/pipermail/neurodebian-users/2012-May/000411.html

nd_adddist fails to create cow images for debian versions when using it on
ubuntu.

The error is:

E: Release signed by unknown key (key id AED4B06F473041FA)

To fix this, we need to explicitly tell it to use the debian archive keyring
when building on ubuntu.

diff --git a/tools/nd_adddist b/tools/nd_adddist
index f85c34df5e2e77f5f349536f394a3f25c845d48f..6c3136d43f7fe97230dd5143da07972228bcc4be 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -26,6 +26,11 @@ if echo $family | grep -q ubuntu; then
     opts+=" --debootstrapopts --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"
 fi
 
+if echo $family | grep -q debian; then
+    # Use debian keyring since otherwise debootstrap would fail (on Ubuntu)
+    opts+=" --debootstrapopts --keyring=/usr/share/keyrings/debian-archive-keyring.gpg"
+fi
+
 mkdir -p ${cowbuilderroot}/cow
 
 for a in i386 amd64; do