X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fpbuilderrc;h=8d16d2b7e823b8532adaefc5eccd91824cb04b0f;hb=de7026840745bb1698be74a085f10f2336a90cdc;hp=327a222717f832ea75bd7ff20839d656ff4fa6e4;hpb=985c9f1a12af5948492c01820a5389200b2d6d4d;p=git-tools-moved-to-github.git diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc index 327a222..8d16d2b 100644 --- a/id-deb-build/pbuilderrc +++ b/id-deb-build/pbuilderrc @@ -7,7 +7,8 @@ : ${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" @@ -15,13 +16,14 @@ APTCACHE="/var/cache/pbuilder/$NAME/aptcache/" # http://releases.ubuntu.com/releases/ case "$DIST" in - intrepid|hardy|gutsy) # ubuntu specific - MIRRORSITE="http://ftp.klid.dk/ftp/ubuntu/" + maverick|lucid|karmic|intrepid|hardy|gutsy|jaunty) # 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 + 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"