X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fpbuilderrc;h=25e2150efb99b49eae778937c4ca372ea05d5570;hb=4b954c378eeea37fa0cf64990ad2fd1b4b729cfd;hp=933fbe11a29211f0bfe6806a4d1e8a73b9f930f3;hpb=6e96cd8fd282e4334cff1829619a219d31419a44;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index 933fbe1..25e2150 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -7,22 +7,28 @@
 : ${ARCH:=$(dpkg --print-architecture)}
 NAME="$DIST-$ARCH"
 DISTRIBUTION="$DIST"
-DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
+# We avoid keyring in assignment below. bug 4122
+DEBOOTSTRAPOPTS=("--arch" "$ARCH" --variant=buildd)
 BASETGZ="`dirname $BASETGZ`/$NAME-base.tgz"
 #BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
 BUILDRESULT="$NAME"
 APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
+ALLOWUNTRUSTED=yes
+CCACHEDIR=
+
+# See https://www.mail-archive.com/debian-bugs-closed@lists.debian.org/msg445261.html  --malc
+USENETWORK=yes
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    maverick|lucid|karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
+    vivid|utopic|trusty|saucy|raring|quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
 	# MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
-	MIRRORSITE="http://mirrors.telianet.dk/ubuntu/"
+	MIRRORSITE="http://mirrors.dotsrc.org/ubuntu/"
         # MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
         COMPONENTS="main restricted universe multiverse"
 	OTHERMIRROR="deb http://ftp.indexdata.dk/ubuntu $DIST main"
         ;;
-    squeeze|lenny|etch) # debian specific
+    jessie|wheezy|squeeze|lenny|etch) # debian specific
         MIRRORSITE="http://ftp.se.debian.org/debian/"
         COMPONENTS="main contrib non-free"
 	OTHERMIRROR="deb http://ftp.indexdata.dk/debian $DIST main"