From 46867d77cb55c76c9f7d7b64dad519c5bd0393cc Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Apr 2015 10:09:49 +0200 Subject: fork X2Go buildscripts for Arctica Project --- bin/build+upload-nsis-package.sh | 1 - bin/build-all-deb-packages | 12 +- bin/build-deb-package | 2 +- bin/build-nsis-package.sh | 288 -------------------------------------- bin/build-rpm-package | 2 +- bin/generate-nsis-version.pl | 29 ---- bin/gitcreate | 43 ------ bin/gitrevno | 2 +- bin/identify-cygwin-packages.sh | 21 --- bin/mingw32-4.4+qt-4.8.wrapper.sh | 5 - bin/mingw32-4.8+qt-4.8.wrapper.sh | 5 - bin/nsis-builder.bat | 41 ------ bin/pkgneedsbuild | 2 +- bin/tarballrelease | 2 +- bin/updatebuildmain | 2 +- bin/updatebuildrelease | 2 +- bin/x2go-release-announcement | 69 --------- home/.buildscripts/arctica.conf | 42 ++++++ home/.buildscripts/itzks.conf | 31 ---- home/.buildscripts/nwt.conf | 40 ------ home/.buildscripts/x2go.conf | 86 ------------ home/.dupload.conf.arctica | 13 ++ home/.dupload.conf.itzks | 45 ------ home/.dupload.conf.nwt | 63 --------- home/.dupload.conf.x2go | 45 ------ home/.pbuilderrc | 65 --------- 26 files changed, 68 insertions(+), 890 deletions(-) delete mode 120000 bin/build+upload-nsis-package.sh delete mode 100755 bin/build-nsis-package.sh delete mode 100755 bin/generate-nsis-version.pl delete mode 100755 bin/gitcreate delete mode 100755 bin/identify-cygwin-packages.sh delete mode 100644 bin/mingw32-4.4+qt-4.8.wrapper.sh delete mode 100755 bin/mingw32-4.8+qt-4.8.wrapper.sh delete mode 100755 bin/nsis-builder.bat delete mode 100755 bin/x2go-release-announcement create mode 100644 home/.buildscripts/arctica.conf delete mode 100644 home/.buildscripts/itzks.conf delete mode 100644 home/.buildscripts/nwt.conf delete mode 100644 home/.buildscripts/x2go.conf create mode 100644 home/.dupload.conf.arctica delete mode 100644 home/.dupload.conf.itzks delete mode 100644 home/.dupload.conf.nwt delete mode 100644 home/.dupload.conf.x2go delete mode 100644 home/.pbuilderrc diff --git a/bin/build+upload-nsis-package.sh b/bin/build+upload-nsis-package.sh deleted file mode 120000 index c9f7891..0000000 --- a/bin/build+upload-nsis-package.sh +++ /dev/null @@ -1 +0,0 @@ -build-nsis-package.sh \ No newline at end of file diff --git a/bin/build-all-deb-packages b/bin/build-all-deb-packages index 08fe9a6..57e7edc 100755 --- a/bin/build-all-deb-packages +++ b/bin/build-all-deb-packages @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2011 by Mike Gabriel +# Copyright (C) 2011-2015 by Mike Gabriel # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. COMPONENT_MAIN="main" -COMPONENT_BAIKAL="baikal" +COMPONENT_LTS="lts" COMPONENT_NIGHTLY="nightly" LIB_PACKAGES_NIGHTLY= @@ -66,9 +66,9 @@ CODENAME=${2:-""} done } -# build all packages tagged as build-baikal -[ "x$COMPONENT" = "x$COMPONENT_BAIKAL" ] || [ -z $COMPONENT ] && { - echo -e $LIB_PACKAGES_BAIKAL $APP_PACKAGES_BAIKAL | while read pkg comp checkout; do +# build all packages marked as lts +[ "x$COMPONENT" = "x$COMPONENT_LTS" ] || [ -z $COMPONENT ] && { + echo -e $LIB_PACKAGES_LTS $APP_PACKAGES_LTS | while read pkg comp checkout; do if [ -n $CODENAME ]; then comp="$comp/$CODENAME" fi @@ -84,5 +84,5 @@ CODENAME=${2:-""} echo "Component: $COMPONENT" echo "Main: $COMPONENT_MAIN" -echo "Baikal: $COMPONENT_BAIKAL" +echo "LTS: $COMPONENT_LTS" echo "Nightly: $COMPONENT_NIGHTLY" diff --git a/bin/build-deb-package b/bin/build-deb-package index 30e0609..0385ec0 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2011-2013 by Mike Gabriel +# Copyright (C) 2011-2015 by Mike Gabriel # # This programme is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh deleted file mode 100755 index a5b023e..0000000 --- a/bin/build-nsis-package.sh +++ /dev/null @@ -1,288 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2011-2013 by Mike Gabriel -# -# This programme is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This programme is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -# Note: This script was adapted from build-deb-package. It is still very -# rough around the edges. For example, many lines are commented out -# and many values are hardcoded. -# It needs to be run under cygwin. -# It also needs to be placed under /cygdrive/d/Build/buildscripts/bin/ - -set -ex - -export PATH=~/bin:/cygdrive/d/Build/buildscripts/bin:$PATH - -GIT_USER="x2go" -GIT_HOSTNAME="code.x2go.org" - -GPG_KEY= -NSIS_DISTS_SUPPORTED="mingw32-4.4,mingw32-4.8" -MINGW_DISTROS="qt-4.8" - -COMPONENT_MAIN="main" -COMPONENT_NIGHTLY="heuler" -COMPONENT_BUNDLES="baikal" - -REPOS_SERVER="code.x2go.org" -GNUPGHOME=$HOME/.gnupg - -test -z $1 && { echo "usage: $(basename $0) [/] {main,main/,nightly,nightly/} []"; exit 1; } - -NO_DELAY=${NO_DELAY:-"no"} -FORCE_BUILD=${FORCE_BUILD:-"yes"} - -echo ${NSIS_BUILD_FOR} - -l_DIST=$(echo ${NSIS_BUILD_FOR} | cut -d":" -f1 | tr [:upper:] [:lower:]) -l_CODENAME=$(echo ${NSIS_BUILD_FOR} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:]) - -set_vars() { - USE_SUDO="no" - PDEBUILD="pdebuild --pbuilder qemubuilder" - TEMP_BASE="/cygdrive/d/Build/tmp" - mkdir -p "$TEMP_BASE" - chmod 2770 "$TEMP_BASE" - - # first argv is the name of the Git project - PROJECT_PATH="$1" - PROJECT_PATH=${PROJECT_PATH/%.git/} - PROJECT="$(basename $PROJECT_PATH)" - - # grab repository component area from command line (2nd argv) or guess it - ARGV2_COMPONENT="$(echo "$2/" | cut -d"/" -f1)" - ARGV2_CODENAME="$(echo "$2/" | cut -d"/" -f2)" - COMPONENT="${ARGV2_COMPONENT:-${COMPONENT:-$COMPONENT_NIGHTLY}}" - CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" - [ -n "$ARGV2_CODENAME" ] && FORCE_BUILD="yes" || true - DATE="${DATE:-$(date +%Y%m%d)}" - if [ "x$COMPONENT" = "x$COMPONENT_MAIN" ]; then - CHECKOUT="${3:-build-main}" - elif echo "$COMPONENT_RELEASES" | grep "$COMPONENT" >/dev/null; then - CHECKOUT="${3:-build-$COMPONENT}" - elif [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then - CHECKOUT="${3:-master}" - else - echo "error: no such package component area for this Git project. Aborting..." - exit 1 - fi - # the DATE might be given as ,,today'' from the command line - [ "x$DATE" = "xtoday" ] && DATE="$(date +%Y%m%d)" - - # setting paths - PROJECT_DIR="/cygdrive/d/Build/GIT/nightly/$l_DIST/$l_CODENAME/x2goclient" - PKGDIST="/cygdrive/d/Build/pkg-dist/nightly/$l_DIST/$l_CODENAME/x2goclient" - - # build for other architectures than amd64/i386 - EXTRA_ARCHS="${EXTRA_ARCHS:-}" - EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}" - - # lock file - LOCK_FILE=$PROJECT_DIR/../.$PROJECT.lock - - # creating paths - mkdir -p "$TEMP_BASE" - mkdir -p "$PROJECT_DIR" -# mkdir -p "$PKGDIST" - - return 0 -} - -prepare_workspace() { - # make sure our local working copy is up to date... - - if [ -d "$PROJECT_DIR/.git" ]; then - cd "$PROJECT_DIR" && git reset --hard - git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT - git pull origin $CHECKOUT - git fetch origin upstream:upstream || true - git fetch origin pristine-tar:pristine-tar || true - # and again, get the $CHECKOUT refspec in pure state - git reset --hard - git clean -df - else - cd "$(dirname $PROJECT_DIR)" - git clone git://$GIT_HOSTNAME/$PROJECT_PATH.git - cd "$PROJECT" - git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; - git fetch origin upstream:upstream - git fetch origin pristine-tar:pristine-tar || true - git clean -df - fi - - GIT_OBJECT_ID=`git show-ref -s heads/master` - cd "$PROJECT_DIR" - - # by default we build for all current debian versions - if [ "x$ARGV2_CODENAME" != "x" ]; then - if echo "$MINGW_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then - NSIS_BUILD_FOR="mingw32-4.4:$ARGV2_CODENAME" - fi - fi - return 0 -} - -clear_pkgdist() { - # pkgdist directory cleanup - echo "$NSIS_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do - l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])" - l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}" - echo "$NSIS_DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { - for l_CODENAME in $l_CODENAMES; do - - # in case we build a special CODENAME (squeeze, wheezy, lucid, ...) do skip - # the wrong distribution here... - test -z $CODENAMES || echo $line | grep $CODENAMES || break - - if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then - for l_ARCH in amd64 i386; do - [ "x$SKIP_ARCH" != "x$l_ARCH" ] && { - mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.changes - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.upload - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.build - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.dsc - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.tar.gz - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.deb - } - done - fi - for l_EXTRA_ARCH in $EXTRA_ARCHS; do - mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/dupload.conf" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_"*.changes - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_"*.upload - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_"*.build - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_"*.dsc - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/$PROJECT_"*.tar.gz - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH/"*.deb - done - done - } - done - return 0 -} - -build_packages() { - - TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" - mkdir -p "$TEMP_DIR/$PROJECT" - chmod 2770 "$TEMP_DIR" -Rf - - cd "$PROJECT_DIR" - git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" - cd "$TEMP_DIR/$PROJECT" - git checkout $CHECKOUT || git checkout master - find $PROJECT_DIR/../ -type f -maxdepth 0 -mindepth 0 | grep $PROJECT_*.orig.tar.gz &>/dev/null && cp $PROJECT_DIR/../$PROJECT_*.orig.tar.gz .. - GITREV=$(gitrevno) - - # TODO: Improve generate-nsis-version.pl so that it can be run from another dir - cd /cygdrive/d/Build/buildscripts/bin/ - ./generate-nsis-version.pl $PROJECT_DIR - - cd $PROJECT_DIR - cp -a --no-preserve=ownership debian/changelog res/txt/ - - # create git changelog immediately prior to building the SRPM package - git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog - cp ChangeLog.gitlog res/txt/git-info - - cd /cygdrive/d/Build/buildscripts/bin/ - - nice /cygdrive/d/Build/buildscripts/bin/nsis-builder.bat "${l_DIST}" "${l_CODENAME}" - - rm -Rf "$TEMP_DIR" - - return 0 -} - -upload_packages() { - # dupload the new packages to the reprepro repository - echo "$NSIS_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do - - # FIXME: this should be handled at the beginning of this script!!! - MINGW_REPOS_BASE=/srv/sites/x2go.org/code/releases/binary-win32/x2goclient/heuler/ - - # create remote directories in archive - 0/dev/null | while read installer; do rm -f "$installer"; done" - - # Ensure that the package is world-readable before being uploaded to an HTTP/HTTPS server. - # Otherwise, sometimes cygwin sftp/scp uploads files with 000 permissions. - # What probably happens is that Cygwin is enumerates the windows permissions as a bunch of ACLs, and sets the octal permissions to 000. - # - # 2014-07-13 - # Commenting this out because for some reason, it could not find the files, thus causing the build to fail. - # Furthermore, the permissions on the uploaded builds are fine right now. - # The file not found error was: - # chmod: Zugriff auf »/cygdrive/d/Build/GIT/nightly/x2goclient/nsis/x2goclient-*-setup.exe“ nicht möglich: Datei oder Verzeichnis nicht gefunden - chmod 755 /cygdrive/d/Build/GIT/nightly/$l_DIST/$l_CODENAME/$PROJECT/nsis/$PROJECT-*-setup.exe - - # copy new installer to download location - scp /cygdrive/d/Build/GIT/nightly/$l_DIST/$l_CODENAME/$PROJECT/nsis/$PROJECT-*-setup.exe $REPOS_SERVER:"$MINGW_REPOS_BASE/$l_DIST/$l_CODENAME/" - done - return 0 -} - -wait_for_lock() { - while [ -f $LOCK_FILE ]; do - pid=$(head -n1 $LOCK_FILE) - if ! ps $pid 1>/dev/null; then rm -f $LOCK_FILE - else - echo "PROJECT directory is locked, sleeping for 10 seconds..." - sleep 10 - fi - done -} - -lock_workspace() { - wait_for_lock - echo $$ > $LOCK_FILE -} - -unlock_workspace() { - rm -f $LOCK_FILE -} - -delay_build() { - sleep $[ ( $RANDOM % 30 ) + 1 ]s -} - -### MAIN ### -set_vars "$@" && { - if [ "x$(basename $0)" = "xbuild-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; then - # Treat any value other than "no" and "0" as true. - cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || ( [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] ) && { - if [ "x$FORCE_BUILD" != "xno" ] && [ "x$FORCE_BUILD" != "x0" ] && ( [ "x$NO_DELAY" = "xno" ] || [ "x$NO_DELAY" = "x0" ] ); then - delay_build - fi - lock_workspace - prepare_workspace && { - unlock_workspace -# clear_pkgdist - build_packages - } - unlock_workspace - } - fi - if [ "x$(basename $0)" = "xupload-nsis-package.sh" ] || [ "x$(basename $0)" = "xbuild+upload-nsis-package.sh" ]; then - upload_packages - fi -} diff --git a/bin/build-rpm-package b/bin/build-rpm-package index adb0291..26c527c 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2011-2013 by Mike Gabriel +# Copyright (C) 2011-2015 by Mike Gabriel # Copyright (C) 2015 by Mihai Moldovan # # This programme is free software; you can redistribute it and/or modify diff --git a/bin/generate-nsis-version.pl b/bin/generate-nsis-version.pl deleted file mode 100755 index 8a85032..0000000 --- a/bin/generate-nsis-version.pl +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/perl - -use strict; - -use POSIX qw(strftime); - -my $date = strftime "%Y.%m.%d", localtime; - -open(F,"<$ARGV[0]/src/version.h") or die; -my @lines=; -close(F); - -my $text=join("",@lines); -my $version=(split("VERSION \"",$text))[1]; -my $version=(split("\"",$version))[0]; -my $hash=`cd $ARGV[0] && git log --pretty=format:'%h' -n 1`; - -open(F,"<$ARGV[0]/nsis/x2goclient.nsi") or die; -@lines=; -close(F); - -$text=join("",@lines); - -$text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/; -#print $text; - -open(F,">$ARGV[0]/nsis/x2goclient.nsi") or die; -print F $text; -close(F); diff --git a/bin/gitcreate b/bin/gitcreate deleted file mode 100755 index 166e091..0000000 --- a/bin/gitcreate +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -set -xe - -GIT_USER="" -GIT_HOSTNAME="" -GIT_SSH_PORT="22" - -PREFIX="$(echo $(basename "${0}") | cut -d"-" -f1)" -. ~/.buildscripts/"${PREFIX}.conf" - -for pkg in "${@}"; do - subdir="$(dirname ${pkg})/" - pkg="$(basename ${pkg})" - - ssh -l"${GIT_USER}" "${GIT_HOSTNAME}" "cd ~/git && _misc_/setup-repository ${subdir}${pkg} '${pkg} upstream project'" - ssh -l"${GIT_USER}" "${GIT_HOSTNAME}" "cd ~/git && _misc_/update-repository-posixacls ${subdir}${pkg}" - - POP="0" - if [ -d "${pkg}" ]; then - pushd "${pkg}" - POP="1" - else - # Use some heuristics to find out if we're already in the directory. - # The current working dir must begin with the string given as parameter. - # Suffixes like .git, -git or the like can be used without making this check fail. - CUR_DIR="$(basename "$(pwd)")" - CUR_DIR="${CUR_DIR:0:${#pkg}}" - if [ "${CUR_DIR}" != "${pkg}" ]; then - echo "Package '${pkg}' does not exist!" >&2 - exit 1 - fi - fi - - echo "${pkg}: MASTER BRANCH" && git push "ssh://${GIT_USER}@${GIT_HOSTNAME}:${GIT_SSH_PORT}/~/git/${subdir}${pkg}" master - git branch | grep upstream &>/dev/null && echo "${pkg}: RELEASE BRANCH" && git push "ssh://${GIT_USER}@${GIT_HOSTNAME}:${GIT_SSH_PORT}/~/git/${subdir}${pkg}" upstream - git branch | grep pristine-tar &>/dev/null && echo "${pkg}: PRISTINE-TAR" && git push "ssh://${GIT_USER}@${GIT_HOSTNAME}:${GIT_SSH_PORT}/~/git/${subdir}${pkg}" pristine-tar - echo "${pkg}: PUSHING TAGS" && git push --tags "ssh://${GIT_USER}@${GIT_HOSTNAME}:${GIT_SSH_PORT}/~/git/${subdir}${pkg}" - git remote | grep origin >/dev/null || git remote add origin "ssh://${GIT_USER}@${GIT_HOSTNAME}:${GIT_SSH_PORT}/~/git/${subdir}${pkg}" - git remote add "${PREFIX}-public" "ssh://${GIT_USER}@${GIT_HOSTNAME}:${GIT_SSH_PORT}/~/git/${subdir}${pkg}" - - [ "${POP}" = "1" ] && popd -done diff --git a/bin/gitrevno b/bin/gitrevno index 2f121ff..5eee128 100755 --- a/bin/gitrevno +++ b/bin/gitrevno @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2010-2011 by Mike Gabriel +# Copyright (C) 2010-2015 by Mike Gabriel # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bin/identify-cygwin-packages.sh b/bin/identify-cygwin-packages.sh deleted file mode 100755 index a16c885..0000000 --- a/bin/identify-cygwin-packages.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -export OUT="cygwin files and packages.csv" - -if [[ $# == 0 ]]; then - echo "Example usage: $0 sh.exe libgcc_s-1.dll" - echo "Output will be appended to \"${OUT}\"" - echo "This script is intended to help with GPL compliance." - echo "Currently this script does not identify the source package," - echo "Only the binary package." - echo "Browse a cygwin mirror or use Google/DuckDuckGo to identify the source package." -fi - -echo "File,Binary Package w/ Version,Source Package" >> "${OUT}" - -for file in "$@" -do - filepath="/bin/${file}" - binPkg=`cygcheck -f $filepath| tr -d '\r' | tr -d '\n'` - echo "${file},${binPkg}," >> "${OUT}" -done diff --git a/bin/mingw32-4.4+qt-4.8.wrapper.sh b/bin/mingw32-4.4+qt-4.8.wrapper.sh deleted file mode 100644 index 71eccfe..0000000 --- a/bin/mingw32-4.4+qt-4.8.wrapper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# This script exists because it appears that you cannot pass env vars -# to C:\cygwin\bin\bash.exe from the windows command prompt. -export NSIS_BUILD_FOR="mingw32-4.4:qt-4.8" -$1 $2 $3 $4 diff --git a/bin/mingw32-4.8+qt-4.8.wrapper.sh b/bin/mingw32-4.8+qt-4.8.wrapper.sh deleted file mode 100755 index a44711c..0000000 --- a/bin/mingw32-4.8+qt-4.8.wrapper.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# This script exists because it appears that you cannot pass env vars -# to C:\cygwin\bin\bash.exe from the windows command prompt. -export NSIS_BUILD_FOR="mingw32-4.8:qt-4.8" -$1 $2 $3 $4 diff --git a/bin/nsis-builder.bat b/bin/nsis-builder.bat deleted file mode 100755 index 38ef344..0000000 --- a/bin/nsis-builder.bat +++ /dev/null @@ -1,41 +0,0 @@ -D: -if "%1"=="mingw32-4.4" ( - cd D:\Build\GIT\nightly\mingw32-4.4\qt-4.8\x2goclient\ - rem this includes setting PATH=%PATH%;D:\MinGW\libexec\gcc\mingw32\4.4.0\ - call "D:\Qt\4.8.5\bin\qtvars.bat" -) -if "%1"=="mingw32-4.8" ( - cd D:\Build\GIT\nightly\mingw32-4.8\qt-4.8\x2goclient\ - rem this includes setting PATH=%PATH%;D:\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\mingw32\libexec\gcc\i686-w64-mingw32\4.8.2\ - call "D:\Qt\4.8.6\bin\qtvars.bat" -) -set PATH=%PATH%;C:\Program Files (x86)\Git\bin\ -set PATH=%PATH%;D:\x2goclient-contrib\upx\3.91_bin\ -set PATH=%PATH%;C:\Program Files (x86)\NSIS\Unicode\ -rem use msysgit's sed -rem enable debug -if "%3"=="--console" sed -i 's/#CONFIG += console/CONFIG += console/' x2goclient.pro -%COMSPEC% /c config_win.bat || exit /b %errorlevel% -cd client_build -mingw32-make || exit /b %errorlevel% -dir release\x2goclient.exe -cd .. -cd x2gohelper -mingw32-make || exit /b %errorlevel% -cd .. -dir client_build\release\x2gohelper.exe -rmdir /s /q nsis\x2goclient -cd nsis -mkdir x2goclient -if "%1"=="mingw32-4.4" ( - xcopy /S D:\Build\scripts\current_files\%1\%2\x2goclient x2goclient -) - -if "%1"=="mingw32-4.8" ( - call ..\copy-deps-win32.bat x2goclient -) -copy ..\client_build\release\x2goclient.exe x2goclient\ -copy ..\client_build\release\x2gohelper.exe x2goclient\ -upx x2goclient\x2goclient.exe -upx x2goclient\x2gohelper.exe -makensis x2goclient.nsi || exit /b %errorlevel% diff --git a/bin/pkgneedsbuild b/bin/pkgneedsbuild index 2a192eb..6df88ff 100755 --- a/bin/pkgneedsbuild +++ b/bin/pkgneedsbuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by Mike Gabriel +# Copyright (C) 2010-2015 by Mike Gabriel # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bin/tarballrelease b/bin/tarballrelease index 1696d9f..2e4db67 100755 --- a/bin/tarballrelease +++ b/bin/tarballrelease @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2011 by Mike Gabriel +# Copyright (C) 2015 by Mike Gabriel # # This is free software; you can redistribute it and/or modify # it under the tBerms of the GNU General Public License as published by diff --git a/bin/updatebuildmain b/bin/updatebuildmain index b7144d0..d686a98 100755 --- a/bin/updatebuildmain +++ b/bin/updatebuildmain @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by Mike Gabriel +# Copyright (C) 2010-2015 by Mike Gabriel # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bin/updatebuildrelease b/bin/updatebuildrelease index 665778a..631d804 100755 --- a/bin/updatebuildrelease +++ b/bin/updatebuildrelease @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2010-2011 by Mike Gabriel +# Copyright (C) 2010-2015 by Mike Gabriel # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bin/x2go-release-announcement b/bin/x2go-release-announcement deleted file mode 100755 index ae0ba3a..0000000 --- a/bin/x2go-release-announcement +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2013 by Mike Gabriel -# -# This programme is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This programme is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -offset=${1:-0} -count=${2:-1} -whereami=`pwd` - -while ! test -f debian/changelog; do - cd .. -done - -project=$(basename `pwd`) -echo " -Subject: $project () released - -Dear all - -The X2Go project is proud to announce a new release of the X2Go -component ,,$project''. - -New gains of this version of ,,$project'' are: - - o - o - o - -" - -cat debian/changelog | sed -e 's/Fixes:/Closes:/i' | dpkg-parsechangelog --offset $offset -c$count -l- | \ - sed -r \ - -e 's/^Closes:/Fixes these bug report(s):/i' \ - -e 's/Closes:/Fixes:/i' \ - -e 's/^Source: /X2Go Component: /' \ - -e 's/-0~x2go[0-9]//' \ - -e 's/-0x2go[0-9]//' \ - -e 's/-0$//' \ - -e "s/^\ $project\ \([0-9]*:([0-9\.]*)\)/\ $project \(\1\)/g" \ - -e 's/^Distribution: unstable/Status: RELEASE/' \ - -e 's/ unstable;/ RELEASED;/' \ - -e 's/^Distribution: UNRELEASED/Status: PREVIEW/' \ - -e 's/ UNRELEASED;/ PREVIEW;/' \ - | egrep -v "^(Urgency:|Maintainer:).*" - -echo -echo " -Regards, - - - - -" -echo -cd "$whereami" diff --git a/home/.buildscripts/arctica.conf b/home/.buildscripts/arctica.conf new file mode 100644 index 0000000..db12079 --- /dev/null +++ b/home/.buildscripts/arctica.conf @@ -0,0 +1,42 @@ +# buildscripts configuration for X2Go build server + +GIT_USER="" +GIT_HOSTNAME="github.com" +GIT_SSH_PORT="" + +DEBEMAIL="build-daemon@arctica-project.org" +DEBFULLNAME="Arctica Project Build Daemon" +GPG_KEY="F2AF24C79CAEF971" +DEB_DISTS_SUPPORTED="debian" +DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:jessie,sid"} + +RPMEMAIL="build-daemon@arctica-project.org" +RPMFULLNAME="Arctica Project Build Daemon"" +GPG_KEY="F2AF24C79CAEF971" +RPM_DISTS_SUPPORTED="fedora opensuse" +: ${RPM_BUILD_FOR:="fedora:22,rawhide 13.2,factory} +RPM_REPOS_BASE="/srv/sites/arctica-project.org/packages/" +RPM_WANT_EXTRA_REPOS="1" +RPM_MOCK_CONFIG_DIR="/etc/mock/" +RPM_EXTRA_REPO_MOCK_CONFIG_BASE="arctica" + +COMPONENT_MAIN="main" +COMPONENT_NIGHTLY="nightly" +COMPONENT_RELEASES="testmain baikal" +REPOS_SERVER="packages.arctica-project.org" +PACKAGE_WITHOUT_OTHERMIRROR="arctica-keyring" + +LIB_PACKAGES_HEULER=" +arctica-keyring ${COMPONENT_NIGHTLY} master\n\ +nx-libs ${COMPONENT_NIGHTLY} 3.6.x\n\ +" +LIB_PACKAGES_MAIN=" +arctica-keyring ${COMPONENT_MAIN} mainline\n\ +nx-libs ${COMPONENT_MAIN} mainline\n\ +" + +APP_PACKAGES_NIGHTLY=" +" + +APP_PACKAGES_MAIN=" +" diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf deleted file mode 100644 index 3bd5e64..0000000 --- a/home/.buildscripts/itzks.conf +++ /dev/null @@ -1,31 +0,0 @@ -# buildscripts configuration for ITZKS build server -GIT_USER=itzks -GIT_HOSTNAME=code.it-zukunft-schule.de -GIT_SSH_PORT=32032 - -DEBEMAIL=itzks-packages@it-zukunft-schule.de -DEBFULLNAME="ITZKS Packages" -GPG_KEY="E41B37C658842183" - -DEB_DISTS_SUPPORTED="debian ubuntu" -DEB_BUILD_FOR="${DEB_BUILD_FOR:-"debian:squeeze,wheezy,jessie,sid"} - -COMPONENT_MAIN="main" -COMPONENT_NIGHTLY="nightly" -REPOS_SERVER="packages.it-zukunft-schule.de" -PACKAGE_WITHOUT_OTHERMIRROR="itzks-keyring" - -LIB_PACKAGES_NIGHTLY="\ -itzks-keyring $COMPONENT_NIGHTLY master\ -" -LIB_PACKAGES_MAIN="\ -itzks-keyring $COMPONENT_MAIN build-main\ -" -APP_PACKAGES_NIGHTLY="\ -scratch $COMPONENT_NIGHTLY master\n\ -coccinella $COMPONENT_NIGHTLY master\ -" -APP_PACKAGES_MAIN="\ -scratch $COMPONENT_MAIN build-main\n\ -coccinella $COMPONENT_MAIN build-main\ -" diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf deleted file mode 100644 index 48c09b7..0000000 --- a/home/.buildscripts/nwt.conf +++ /dev/null @@ -1,40 +0,0 @@ -# buildscripts configuration for NWT build server - -GIT_USER=nwt -GIT_HOSTNAME=code.das-netzwerkteam.de -GIT_SSH_PORT=32032 - -DEBEMAIL=debian@das-netzwerkteam.de -DEBFULLNAME="NWT Packages" -GPG_KEY="4DC41CF116990FF8" -DEB_DISTS_SUPPORTED="debian ubuntu" -DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise"} - -COMPONENT_MAIN="main" -COMPONENT_NIGHTLY="nightly" -REPOS_SERVER="packages.das-netzwerkteam.de" -PACKAGE_WITHOUT_OTHERMIRROR="nwt-keyring" - -LIB_PACKAGES_NIGHTLY="\ -nwt/nwt-keyring $COMPONENT_NIGHTLY master\n\ -nwt/logcheck-database-nwt $COMPONENT_NIGHTLY master\n\ -debian/cx-freeze $COMPONENT_NIGHTLY master\n\ -python-easyldap $COMPONENT_NIGHTLY master\ -" -LIB_PACKAGES_MAIN="\ -nwt/nwt-keyring $COMPONENT_MAIN build-main\n\ -nwt/logcheck-database-nwt $COMPONENT_MAIN build-main\n\ -debian/cx-freeze $COMPONENT_MAIN build-main\n\ -python-easyldap $COMPONENT_MAIN build-main\ -" - -APP_PACKAGES_NIGHTLY="\ -nwt/nwt-hostconfig $COMPONENT_NIGHTLY master\n\ -dirvish-vm-tools $COMPONENT_NIGHTLY master\ -" -APP_PACKAGES_MAIN="\ -nwt/nwt-hostconfig $COMPONENT_MAIN build-main\n\ -dirvish-vm-tools $COMPONENT_MAIN build-main\ -" - - diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf deleted file mode 100644 index 6b6384a..0000000 --- a/home/.buildscripts/x2go.conf +++ /dev/null @@ -1,86 +0,0 @@ -# buildscripts configuration for X2Go build server - -GIT_USER="x2go" -GIT_HOSTNAME="code.x2go.org" -GIT_SSH_PORT="32032" - -DEBEMAIL="git-admin@x2go.org" -DEBFULLNAME="X2Go Git Administrator" -GPG_KEY="F4A7678C9C6B0B2B" -DEB_DISTS_SUPPORTED="debian" -DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:squeeze,wheezy,jessie,sid"} - -RPMEMAIL="git-admin@x2go.org" -RPMFULLNAME="X2Go Git Administrator" -GPG_KEY="F4A7678C9C6B0B2B" -RPM_DISTS_SUPPORTED="fedora epel opensuse sle" -: ${RPM_BUILD_FOR:="fedora:18,19,20,21,22,rawhide epel:6,7 opensuse:12.2,12.3,13.1,13.2 sle:11.2,11.3,12.0"} -RPM_REPOS_BASE="/srv/sites/x2go.org/packages/" -RPM_WANT_EXTRA_REPOS="1" -RPM_MOCK_CONFIG_DIR="/etc/mock/" -RPM_EXTRA_REPO_MOCK_CONFIG_BASE="x2go" - -COMPONENT_MAIN="main" -COMPONENT_NIGHTLY="heuler" -COMPONENT_RELEASES="testmain baikal" -REPOS_SERVER="packages.x2go.org" -PACKAGE_WITHOUT_OTHERMIRROR="x2go-keyring" - -LIB_PACKAGES_HEULER=" -x2go-keyring ${COMPONENT_NIGHTLY} master\n\ -nx-libs ${COMPONENT_NIGHTLY} master\n\ -python-x2go ${COMPONENT_NIGHTLY} master\ -libpam-x2go ${COMPONENT_NIGHTLY} master\n\ -lightdm-remote-session-x2go ${COMPONENT_NIGHTLY} master\n\ -" -LIB_PACKAGES_MAIN=" -x2go-keyring ${COMPONENT_MAIN} build-main\n\ -nx-libs ${COMPONENT_MAIN} build-main\n\ -python-x2go ${COMPONENT_MAIN} build-main\ -libpam-x2go ${COMPONENT_MAIN} build-main\ -lightdm-remote-session-x2go ${COMPONENT_MAIN} build-main\ -" -LIB_PACKAGES_BAIKAL="${LIB_PACKAGES_MAIN}" - -APP_PACKAGES_NIGHTLY=" -x2goserver ${COMPONENT_NIGHTLY} master\n\ -x2gobroker ${COMPONENT_NIGHTLY} master\n\ -x2goclient ${COMPONENT_NIGHTLY} master\n\ -cups-x2go ${COMPONENT_NIGHTLY} master\n\ -x2goadmincenter ${COMPONENT_NIGHTLY} master\n\ -x2godesktopsharing $C{OMPONENT_NIGHTLY} master\n\ -x2gognomebindings ${COMPONENT_NIGHTLY} master\n\ -x2golxdebindings ${COMPONENT_NIGHTLY} master\n\ -x2goplasmabindings ${COMPONENT_NIGHTLY} master\n\ -pyhoca-gui ${COMPONENT_NIGHTLY} master\n\ -pyhoca-cli ${COMPONENT_NIGHTLY} master\n\ -x2gothinclient ${COMPONENT_NIGHTLY} master\ -" - -APP_PACKAGES_MAIN=" -x2goserver ${COMPONENT_MAIN} build-main\n\ -x2gobroker ${COMPONENT_MAIN} build-main\n\ -x2goclient ${COMPONENT_MAIN} build-main\n\ -cups-x2go ${COMPONENT_MAIN} build-main\n\ -x2godesktopsharing ${COMPONENT_MAIN} build-main\n\ -x2gognomebindings ${COMPONENT_MAIN} build-main\n\ -x2golxdebindings ${COMPONENT_MAIN} build-main\n\ -x2goplasmabindings ${COMPONENT_MAIN} build-main\n\ -pyhoca-gui ${COMPONENT_MAIN} build-main\n\ -pyhoca-cli ${COMPONENT_MAIN} build-main\n\ -x2gothinclient ${COMPONENT_MAIN} build-main\ -" - -APP_PACKAGES_BAIKAL=" -x2goserver ${COMPONENT_MAIN} build-baikal\n\ -x2goclient ${COMPONENT_MAIN} build-baikal\n\ -cups-x2go ${COMPONENT_MAIN} build-baikal\n\ -x2godesktopsharing ${COMPONENT_MAIN} build-baikal\n\ -x2gognomebindings ${COMPONENT_MAIN} build-baikal\n\ -x2golxdebindings ${COMPONENT_MAIN} build-baikal\n\ -x2goplasmabindings ${COMPONENT_MAIN} build-baikal\n\ -pyhoca-gui ${COMPONENT_MAIN} build-baikal\n\ -pyhoca-cli ${COMPONENT_MAIN} build-baikal\n\ -x2gothinclient ${COMPONENT_MAIN} build-baikal\ -" - diff --git a/home/.dupload.conf.arctica b/home/.dupload.conf.arctica new file mode 100644 index 0000000..68a6ac5 --- /dev/null +++ b/home/.dupload.conf.arctica @@ -0,0 +1,13 @@ +package config; + +### Arctica packages for Debian +$cfg{"arctica-debian-production"} = { + fqdn => "packages.arctica-project.org", + login => "repo-admin", + method => "scpb", + incoming => "/srv/sites/x2go.org/packages/debian/incoming/production", + queuedir => "/srv/sites/x2go.org/packages/debian/upload/production", + dinstall_runs => 1, +}; + +1; diff --git a/home/.dupload.conf.itzks b/home/.dupload.conf.itzks deleted file mode 100644 index 3adb5d5..0000000 --- a/home/.dupload.conf.itzks +++ /dev/null @@ -1,45 +0,0 @@ -package config; - -### itzks/DEBIAN -$cfg{"itzks-debian-sid"} = { - fqdn => "packages.it-zukunft-schule.de", - login => "itzks-admin", - method => "scpb", - incoming => "/srv/sites/it-zukunft-schule.de/packages/debian/incoming/sid", - queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/sid", - dinstall_runs => 1, -}; -$cfg{"itzks-debian-jessie"} = { - fqdn => "packages.it-zukunft-schule.de", - login => "itzks-admin", - method => "scpb", - incoming => "/srv/sites/it-zukunft-schule.de/packages/debian/incoming/jessie", - queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/jessie", - dinstall_runs => 1, -}; -$cfg{"itzks-debian-wheezy"} = { - fqdn => "packages.it-zukunft-schule.de", - login => "itzks-admin", - method => "scpb", - incoming => "/srv/sites/it-zukunft-schule.de/packages/debian/incoming/wheezy", - queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/wheezy", - dinstall_runs => 1, -}; -$cfg{"itzks-debian-squeeze"} = { - fqdn => "packages.it-zukunft-schule.de", - login => "itzks-admin", - method => "scpb", - incoming => "/srv/sites/it-zukunft-schule.de/packages/debian/incoming/squeeze", - queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/squeeze", - dinstall_runs => 1, -}; -$cfg{"itzks-debian-lenny"} = { - fqdn => "packages.it-zukunft-schule.de", - login => "itzks-admin", - method => "scpb", - incoming => "/srv/sites/it-zukunft-schule.de/packages/debian/incoming/lenny", - queuedir => "/srv/sites/it-zukunft-schule.de/packages/debian/upload/lenny", - dinstall_runs => 1, -}; - -1; diff --git a/home/.dupload.conf.nwt b/home/.dupload.conf.nwt deleted file mode 100644 index a5ce122..0000000 --- a/home/.dupload.conf.nwt +++ /dev/null @@ -1,63 +0,0 @@ -package config; - -### nwt/DEBIAN -$cfg{"nwt-debian-sid"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/debian/incoming/sid", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/sid", - dinstall_runs => 1, -}; -$cfg{"nwt-debian-jessie"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/debian/incoming/jessie", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/jessie", - dinstall_runs => 1, -}; -$cfg{"nwt-debian-wheezy"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/debian/incoming/wheezy", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/wheezy", - dinstall_runs => 1, -}; -$cfg{"nwt-debian-squeeze"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/debian/incoming/squeeze", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/squeeze", - dinstall_runs => 1, -}; -$cfg{"nwt-debian-lenny"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/debian/incoming/lenny", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/debian/upload/lenny", - dinstall_runs => 1, -}; - -$cfg{"nwt-ubuntu-precise"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/incoming/precise", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/upload/precise", - dinstall_runs => 1, -}; -$cfg{"nwt-ubuntu-lucid"} = { - fqdn => "packages.das-netzwerkteam.de", - login => "nwt-admin", - method => "scpb", - incoming => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/incoming/lucid", - queuedir => "/srv/sites/das-netzwerkteam.de/packages/ubuntu/upload/lucid", - dinstall_runs => 1, -}; - - -1; diff --git a/home/.dupload.conf.x2go b/home/.dupload.conf.x2go deleted file mode 100644 index 5e1db65..0000000 --- a/home/.dupload.conf.x2go +++ /dev/null @@ -1,45 +0,0 @@ -package config; - -### X2Go/DEBIAN -$cfg{"x2go-debian-sid"} = { - fqdn => "code.x2go.org", - login => "x2go-admin", - method => "scpb", - incoming => "/srv/sites/x2go.org/packages/debian/incoming/sid", - queuedir => "/srv/sites/x2go.org/packages/debian/upload/sid", - dinstall_runs => 1, -}; -$cfg{"x2go-debian-jessie"} = { - fqdn => "code.x2go.org", - login => "x2go-admin", - method => "scpb", - incoming => "/srv/sites/x2go.org/packages/debian/incoming/jessie", - queuedir => "/srv/sites/x2go.org/packages/debian/upload/jessie", - dinstall_runs => 1, -}; -$cfg{"x2go-debian-wheezy"} = { - fqdn => "code.x2go.org", - login => "x2go-admin", - method => "scpb", - incoming => "/srv/sites/x2go.org/packages/debian/incoming/wheezy", - queuedir => "/srv/sites/x2go.org/packages/debian/upload/wheezy", - dinstall_runs => 1, -}; -$cfg{"x2go-debian-squeeze"} = { - fqdn => "code.x2go.org", - login => "x2go-admin", - method => "scpb", - incoming => "/srv/sites/x2go.org/packages/debian/incoming/squeeze", - queuedir => "/srv/sites/x2go.org/packages/debian/upload/squeeze", - dinstall_runs => 1, -}; -$cfg{"x2go-debian-lenny"} = { - fqdn => "code.x2go.org", - login => "x2go-admin", - method => "scpb", - incoming => "/srv/sites/x2go.org/packages/debian/incoming/lenny", - queuedir => "/srv/sites/x2go.org/packages/debian/upload/lenny", - dinstall_runs => 1, -}; - -1; diff --git a/home/.pbuilderrc b/home/.pbuilderrc deleted file mode 100644 index b61d0b1..0000000 --- a/home/.pbuilderrc +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -set -x - -BASEDIRECTORY="/srv/pbuilder/cache" - -DIST=${DIST:-debian} -CODENAME=${CODENAME:-sid} -ARCH=${ARCH:-amd64} -COMPONENT="${COMPONENT:-nightly}" - -# pbuilder options -BASETGZ="$BASEDIRECTORY/base-$DIST-$CODENAME-$ARCH.tgz" -DISTRIBUTION="$CODENAME" -BUILDRESULT="$BASEDIRECTORY/$DIST-$CODENAME-$ARCH/result/" -APTCACHE="$BASEDIRECTORY/$DIST-$CODENAME-$ARCH/aptcache/" - -BUILDRESULTUID=$(id -u) -BUILDRESULTGID=$(id -g) - -# this needs to be disabled -CCACHEDIR= -APTCACHEHARDLINK="yes" -USE_DEBUILD_INTERNAL="yes" -PRESERVE_BUILDPLACE="yes" - -ARCHITECTURE="$ARCH" - -# pbuilder-uml option -UML_DISTRIBUTION="$CODENAME" - -# qemubuilder options -BASEPATH="$BASEDIRECTORY/base-$DIST-$CODENAME-$ARCH.qemu" -if [ -e "/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz.$CODENAME" ]; then - KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz.$CODENAME - INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img.$CODENAME -else - KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz - INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img -fi - -ARCH_DISKDEVICE=sd -if [ "x$ARCH" = "xarmel" ]; then - MEMORY_MEGS=256 - INITRD= -else - SMP="2" - MEMORY_MEGS=512 -fi - -if [ "x${DIST}" = "xubuntu" ]; then - if [ "x$ARCH" = "xarmel" ] || [ "x$ARCH" = "xpowerpc" ]; then - MIRRORSITE="http://localhost:3142/ports.ubuntu.com/" - else - MIRRORSITE="http://localhost:3142/ubuntu" - fi -elif [ "x${DIST}" = "xdebian" ]; then - if [ "x${CODENAME}" = "xlenny" ]; then - MIRRORSITE="http://localhost:3142/archive.debian.org/debian" - else - MIRRORSITE="http://localhost:3142/debian" - fi -fi - -EXTRA_ARCHS=armel -- cgit v1.2.3