X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fpbuilderrc;h=d27c5026fec0cf7a66aaad0337d4ab561c1c1e5a;hb=2fe528774e66bf84dbb9ae501c107fd8d394ccdf;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..d27c502 100644
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -7,17 +7,23 @@
 : ${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/"
 
+# http://releases.ubuntu.com/releases/
 case "$DIST" in
-    intrepid|hardy|gutsy) # ubuntu specific
-        MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
+    natty|maverick|lucid|karmic) # ubuntu specific
+	# MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
+	MIRRORSITE="http://mirrors.telianet.dk/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
+    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"