X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fpbuilderrc;h=0772d4dd5c85d84add81883f23a977d456b96ba9;hb=781f7fe6d211d551c657bf66a08f051ee26bda6e;hp=73653821e3b1124e5060161182c958537fc417ed;hpb=914758376bc88e2d325854bfdf1d52efe2eaf182;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index 7365382..0772d4d 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -3,21 +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="/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
-    intrepid|hardy|gutsy) # ubuntu specific
-        MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
+    vivid|utopic|trusty|saucy|raring|quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
+	# MIRRORSITE="http://ftp.df.lth.se/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"
         ;;
-    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"