summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-04-28 02:43:26 +0200
committerX2go Administrator <x2go-admin@minobo.das-netzwerkteam.de>2011-04-28 02:43:26 +0200
commit3249c6abc9bcbd8c6b8ad0951b54c6adfe0e72cf (patch)
tree2640fe78ada79acbc17eeb732d1585d3cbdb1d35
parent1eced7b5c0e6401ff6df55fcef4f251a9e6eb655 (diff)
downloadbuildscripts-3249c6abc9bcbd8c6b8ad0951b54c6adfe0e72cf.tar.gz
buildscripts-3249c6abc9bcbd8c6b8ad0951b54c6adfe0e72cf.tar.bz2
buildscripts-3249c6abc9bcbd8c6b8ad0951b54c6adfe0e72cf.zip
move OTHERMIRROR declaration into CODENAME loop
-rwxr-xr-xbin/x2go-buildpackage2
-rw-r--r--home/.pbuilderrc2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/x2go-buildpackage b/bin/x2go-buildpackage
index 1412043..5c89da0 100755
--- a/bin/x2go-buildpackage
+++ b/bin/x2go-buildpackage
@@ -39,7 +39,6 @@ PACKAGE_DIR=$HOME/build/$COMPONENT/$PACKAGE
DIST_SUPPORTED="debian ubuntu"
PKGDIST="$HOME/pkg-dist/$COMPONENT/$PACKAGE"
-OTHERMIRROR=${OTHERMIRROR:-"deb http://code.x2go.org/debian $CODENAME $COMPONENT"}
# creating paths
mkdir -p "$TEMP_BASE"
@@ -106,6 +105,7 @@ cat BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do
# modify changelog for this build
DEBEMAIL=git-admin@x2go.org DEBFULLNAME="X2go Git Administrator" dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE" "Auto-built $l_DIST $l_CODENAME package for packages.x2go.org repository."
mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
+ OTHERMIRROR="deb http://code.x2go.org/debian $l_CODENAME $COMPONENT"}
[ "x$USE_SUDO" != "xyes" ] && {
cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64
diff --git a/home/.pbuilderrc b/home/.pbuilderrc
index 9b3661d..e9670a8 100644
--- a/home/.pbuilderrc
+++ b/home/.pbuilderrc
@@ -40,7 +40,7 @@ else
fi
if [ "x${DIST}" = "xubuntu" ]; then
- MIRRORSITE="http://localhost:9999/ubuntu"
+ MIRRORSITE="http://localhost:3142/ubuntu"
elif [ "x${DIST}" = "xdebian" ]; then
MIRRORSITE="http://localhost:3142/debian"
fi