Add Ubuntu raring, Debian jessie to pbuilderrc

[git-tools-moved-to-github.git] / id-deb-build / pbuilderrc

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index 9c76232..6b843d9 100644 (file)
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -7,22 +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"
 APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
+ALLOWUNTRUSTED=yes
+CCACHEDIR=
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    lucid|karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
+    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"