X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fpbuilderrc;h=15b1eca36273f508cefb2dc47ac244b2078deaca;hb=f2e36b39b0e6cb21eb1247daf7147ceb5cf0ea82;hp=32f8ce1206871e7c32b130e0f39783a794c19655;hpb=5ad25e186f28b1ee69d798ba8cc928c1dcaa84f8;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index 32f8ce1..15b1eca 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -7,21 +7,25 @@
 : ${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/result/"
+BUILDRESULT="$NAME"
 APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
+ALLOWUNTRUSTED=yes
+CCACHEDIR=
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    intrepid|hardy|gutsy) # ubuntu specific
-	MIRRORSITE="http://ftp.klid.dk/ftp/ubuntu/"
+    saucy|raring|quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
+	# MIRRORSITE="http://ftp.df.lth.se/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"
         ;;
-    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"