X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fpbuilderrc;h=501a6de87d2837e0ef78244e89d4c2bc36656ca7;hb=839efe6d8548bf2453b282bd49cf1deca4ad079f;hp=beb69c4567d8f309ac72653bcb63dae471df17dc;hpb=eef8219889d241600b50cadf7c5f61c03feb4f4b;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index beb69c4..501a6de 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -3,26 +3,32 @@
 # https://wiki.ubuntu.com/PbuilderHowto
 #DIST=`dpkg-parsechangelog | awk '/^Distribution: / {print $2}'`
 
-: ${DIST:=$(lsb_release --short --codename)}
-: ${ARCH:=$(dpkg --print-architecture)}
+# : ${DIST:=$(lsb_release --short --codename)}
+# : ${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
-    karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
+    wily|vivid|utopic|trusty|saucy|raring|quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
 	# MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
-	MIRRORSITE="http://ftp.klid.dk/ftp/ubuntu/"
+	MIRRORSITE="http://mirror.one.com/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"