From: Michael Hanke <michael.hanke@gmail.com>
Date: Mon, 7 May 2012 09:15:47 +0000 (-0700)
Subject: Merge pull request #4 from esc/fix/building-debian-packages-on-ubuntu
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d45c352f20ae5a4765dba8af040ecf5eeafd853;hp=ae432553398926634d9d1bf93d8cc4f739fecf8d;p=neurodebian.git

Merge pull request #4 from esc/fix/building-debian-packages-on-ubuntu

Fix/building debian packages on ubuntu
---

diff --git a/tools/nd_adddist b/tools/nd_adddist
index b4a3f21..6c3136d 100755
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -22,8 +22,13 @@ fi
 opts="--distribution $dist --debootstrap debootstrap --aptcache $aptcache"
 
 if echo $family | grep -q ubuntu; then
-	# Use ubuntu's keyring since otherwise debootstrap would fail
-	opts+=" --debootstrapopts --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"
+    # Use ubuntu's keyring since otherwise debootstrap would fail
+    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