cleanup

11 files changed, 0 insertions, 529 deletions

diff --git a/bin/x2go-build+upload-all-packages b/bin/x2go-build+upload-all-packages
deleted file mode 120000
index b77cc44..0000000
--- a/bin/x2go-build+upload-all-packages
+++ /dev/null
@@ -1 +0,0 @@
-x2go-build-all-packages
\ No newline at end of file
diff --git a/bin/x2go-build+upload-package b/bin/x2go-build+upload-package
deleted file mode 120000
index b6ef03d..0000000
--- a/bin/x2go-build+upload-package
+++ /dev/null
@@ -1 +0,0 @@
-x2go-build-package
\ No newline at end of file
diff --git a/bin/x2go-build-all-packages b/bin/x2go-build-all-packages
deleted file mode 100755
index 6790b44..0000000
--- a/bin/x2go-build-all-packages
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash 
-
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# Python X2go 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.
-#
-# Python X2go 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.
-
-LIB_PACKAGES_HEULER="\
-x2go-keyring heuler master\n
-nx-libs heuler master\n
-python-x2go heuler master\n
-"
-LIB_PACKAGES_MAIN="\
-x2go-keyring main master\n
-nxcomp main build-main\n
-nxcompext main build-main\n
-nxcompshad main build-main\n
-python-x2go main build-main\n
-"
-
-APP_PACKAGES_HEULER="\
-x2goserver heuler master\n
-x2goagent heuler master\n
-x2goclient heuler master\n
-nxproxy heuler master\n
-cups-x2go heuler master\n
-x2godesktopsharing heuler master\n
-x2goadmincenter heuler master\n
-x2gognomebindings heuler master\n
-x2golxdebindings heuler master\n
-x2goplasmabindings heuler master\n
-x2gotrinitybindings heuler master\n
-pyhoca-gui heuler master\n
-pyhoca-cli heuler master\n
-x2gothinclient heuler master
-"
-APP_PACKAGES_MAIN="\
-x2goserver main build-main\n
-x2goagent main build-main\n
-x2goclient main build-main\n
-nxproxy main build-main\n
-cups-x2go main build-main\n
-x2godesktopsharing main build-main\n
-x2gognomebindings main build-main\n
-x2goplasmabindings main master\n
-x2gotrinitybindings main master\n
-pyhoca-gui main build-main\n
-pyhoca-cli main build-main\n
-x2gothinclient main build-main
-"
-
-COMPONENT=${1:-""}
-
-# build the newest code... (nightly-builds)
-[ "x$COMPONENT" = "xheuler" ] || [ -z $COMPONENT ] && {
-    echo -e $LIB_PACKAGES_HEULER $APP_PACKAGES_HEULER | while read pkg comp checkout; do
-	if [ "x$(basename $0)" = "xx2go-build-all-packages" ]; then
-		x2go-build-package $pkg $comp $checkout
-	elif [ "x$(basename $0)" = "xx2go-upload-all-packages" ]; then
-		x2go-upload-package $pkg $comp $checkout
-	elif [ "x$(basename $0)" = "xx2go-build+upload-all-packages" ]; then
-		x2go-build-package $pkg $comp $checkout && x2go-upload-package $pkg $comp $checkout
-	fi
-    done
-}
-
-# build all packages tagged as build-main
-[ "x$COMPONENT" = "xmain" ] || [ -z $COMPONENT ] && {
-    echo -e $LIB_PACKAGES_MAIN $APP_PACKAGES_MAIN | while read pkg comp checkout; do
-	if [ "x$(basename $0)" = "xx2go-build-all-packages" ]; then
-		x2go-build-package $pkg $comp $checkout
-	elif [ "x$(basename $0)" = "xx2go-upload-all-packages" ]; then
-		x2go-upload-package $pkg $comp $checkout
-	elif [ "x$(basename $0)" = "xx2go-build+upload-all-packages" ]; then
-		x2go-build-package $pkg $comp $checkout && x2go-upload-package $pkg $comp $checkout
-	fi
-    done
-}
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
deleted file mode 100755
index bb7bcc5..0000000
--- a/bin/x2go-build-package
+++ /dev/null
@@ -1,245 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# 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.
-
-test -z $1 && { echo "usage: <x2go-git-project> {main,main/<codename>,heuler,heuler/<codename>} [<git-checkout>]"; exit -1; }
-
-set -ex
-
-set_vars() {
-	USE_SUDO="yes"
-	PDEBUILD="pdebuild --pbuilder qemubuilder"
-	TEMP_BASE="$HOME/tmp/"
-	mkdir -p "$TEMP_BASE"
-	chmod 2770 "$TEMP_BASE"
-
-	# first argv is the name of the Git project
-	PROJECT=$1
-
-	# 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:-heuler}}
-	CODENAMES=${ARGV2_CODENAME:-${CODENAMES}}
-	[ -n "$ARGV2_CODENAME" ] && FORCE_BUILD=0 || FORCE_BUILD=-1
-	if [ "x$COMPONENT" = "xmain" ]; then
-		CHECKOUT=${3:-build-main}
-	elif [ "x$COMPONENT" = "xheuler" ]; then
-		CHECKOUT=${3:-master}
-		DATE="~${DATE:-$(date +%Y%m%d)}"
-	else
-		echo "error: no such package component area for X2go packages. 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=$HOME/build/$COMPONENT/$PROJECT
-	DIST_SUPPORTED="debian ubuntu"
-	PKGDIST="$HOME/pkg-dist/$COMPONENT/$PROJECT"
-
-	# build for other architectures than amd64/i386
-	EXTRA_ARCHS="${EXTRA_ARCHS:-}"
-	EXTRA_ARCHS_ONLY="${EXTRA_ARCHS_ONLY:-}"
-
-	# creating paths
-	mkdir -p "$TEMP_BASE"
-	mkdir -p $PROJECT_DIR
-	mkdir -p $PKGDIST
-
-	return 0
-}
-
-clear_pkgdist() {
-
-	# pkgdist directory cleanup
-	cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do
-		l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])
-		CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}
-		echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && {
-			for l_CODENAME in $CODENAMES; do
-				if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then
-					for l_ARCH in amd64 i386; do
-						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH
-						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/$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
-}
-
-prepare_workspace() {
-	# in any case remove the BUILDS_FOR file
-	rm -f $PROJECT_DIR/BUILDS_FOR
-
-	# 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
-		# and again, get the $CHECKOUT refspec in pure state
-		git reset --hard
-	else
-		cd $(dirname $PROJECT_DIR)
-		git clone git://code.x2go.org/$PROJECT.git
-		cd $PROJECT 
-		git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT;
-	fi
-	cd $PROJECT_DIR
-
-	# by default we build for all current debian versions
-	test -f BUILDS_FOR || cat > BUILDS_FOR <<EOF
-debian: squeeze wheezy sid
-#ubuntu: lucid maverick natty
-EOF
-	return 0
-}
-
-build_packages() {
-	# use pbuilder for building all variants of this package
-	cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do
-		l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])
-		CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}
-		echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && {
-			for l_CODENAME in $CODENAMES; do
-				TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)"
-				mkdir -p $TEMP_DIR/$PROJECT
-				chmod 27550 "$TEMP_DIR" -Rf
-				git clone --local $PROJECT_DIR $TEMP_DIR/$PROJECT/ 
-				cd $TEMP_DIR/$PROJECT
-				git checkout $CHECKOUT || git checkout master
-				GITREV=$(x2go-gitrevno)
-				# we always build native packages for our repos
-				test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
-					echo "3.0 (native)" > debian/source/format
-				}
-				# translate the version name for Debian releases
-				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
-				[ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing
-				[ "x$l_CODENAME" = "xsqueeze" ] && VERSION=stable
-				[ "x$l_CODENAME" = "xlenny" ] && VERSION=oldstable
-				
-				# modify the section for non-main package builds
-				[ "x$COMPONENT" = "xmain" ] || {
-					mv debian/control debian/control.tmp
-					cat debian/control.tmp | sed  "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control
-				}
-				
-				# modify changelog for this build
-				DEBEMAIL=git-admin@x2go.org DEBFULLNAME="X2go Git Administrator" dch --distribution $VERSION --force-distribution -l "+$l_CODENAME~$COMPONENT$DATE~$GITREV~build" "Auto-built $l_DIST $l_CODENAME package for packages.x2go.org repository."
-				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
-				OTHERMIRROR="deb http://packages.x2go.org/debian $l_CODENAME $COMPONENT"
-				[ "x$USE_SUDO" != "xyes" ] && {
-					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						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
-						}
-						cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch
-						}
-					}
-					for extra_arch in $EXTRA_ARCHS; do
-						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch
-						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
-							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch
-						}
-					done
-				}
-				[ "x$USE_SUDO" = "xyes" ] && {
-					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
-							sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64
-						}
-						cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-							sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch
-						}
-					}
-					for extra_arch in $EXTRA_ARCHS; do
-						mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch
-						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
-						    sudo DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k F4A7678C9C6B0B2B --buildresult $PKGDIST/$l_DIST/$l_CODENAME/$extra_arch -- --binary-arch
-						}
-					done
-				}
-				cd -
-				rm -Rf $TEMP_DIR
-			done
-			echo
-		}
-		echo
-	done
-	return 0
-}
-
-upload_packages() {
-	# dupload the new packages to the reprepro repository
-	cd $PKGDIST
-	cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do
-		l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z])
-		CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])}
-		for l_CODENAME in $CODENAMES; do
-			if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then	
-				for l_ARCH in amd64 i386; do 
-					cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH
-					ls $PROJECT_*.changes &>/dev/null && dupload --to x2go-$l_DIST-$l_CODENAME $PROJECT_*.changes
-					cd -
-				done
-			fi
-			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
-				cd $PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH
-				ls $PROJECT_*.changes &>/dev/null && dupload --to x2go-$l_DIST-$l_CODENAME $PROJECT_*.changes
-				cd -
-			done
-		done
-	done
-	cd -
-	return 0
-}
-
-### MAIN ###
-set_vars $@ && {
-	if [ "x$(basename $0)" = "xx2go-build-package" ] || [ "x$(basename $0)" = "xx2go-build+upload-package" ]; then
-		cd $PROJECT_DIR && x2go-pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && {
-			clear_pkgdist
-			prepare_workspace && {
-				build_packages
-			}
-		}
-	fi
-	if [ "x$(basename $0)" = "xx2go-upload-package" ] || [ "x$(basename $0)" = "xx2go-build+upload-package" ]; then
-		upload_packages
-	fi
-}
diff --git a/bin/x2go-gitcreate b/bin/x2go-gitcreate
deleted file mode 100755
index 5c6d387..0000000
--- a/bin/x2go-gitcreate
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# Python X2go 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.
-#
-# Python X2go 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.
-
-# Thanks to Jonas Smedegaard <dr@jones.dk> for inspiration...
-
-set -e
-
-for pkg in "$@"; do
-	ssh -lx2go code.x2go.org "cd /srv/git/code.x2go.org && ./setup-repository $pkg '$pkg upstream project'"
-	ssh -lx2go-admin code.x2go.org "cd /srv/git/code.x2go.org && ./update-repository-posixacls $pkg"
-	cd "$pkg"
-	echo "$pkg: MASTER BRANCH" && git push ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/$pkg master 
-	#echo "$pkg: RELEASE BRANCH" && git push ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/$pkg release
-	#echo "$pkg: PRISTINE-TAR" && git push ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/$pkg pristine-tar
-	echo "$pkg: PUSHING TAGS" && git push --tags ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/$pkg
-	git remote add ssh://x2go@code.x2go.org:32032/srv/git/code.x2go.org/$pkg
-	cd ..
-done
diff --git a/bin/x2go-gitrevno b/bin/x2go-gitrevno
deleted file mode 100755
index 7065da2..0000000
--- a/bin/x2go-gitrevno
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# Python X2go 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.
-#
-# Python X2go 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
-
-import subprocess
-_proc = subprocess.Popen('git log --no-color --date=iso',
-                         shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-try:
-    GIT_REVISION_DATE = str(len([ x for x in _proc.communicate()[0].splitlines() if x.startswith('Date:')]))
-except IndexError:
-    GIT_REVISION_DATE = 'unknown'
-
-print GIT_REVISION_DATE
diff --git a/bin/x2go-pkgneedsbuild b/bin/x2go-pkgneedsbuild
deleted file mode 100755
index 700a3f7..0000000
--- a/bin/x2go-pkgneedsbuild
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# Python X2go 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.
-#
-# Python X2go 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
-
-set -xe
-
-CHECKOUT=${1:-master}
-
-[ -d .git ] && {
-
-	TIMESTAMP=$(date +%s)
-	CURRENT_BRANCH=$(git branch | grep "*" | awk '{print $2}')
-
-	# switch to branch given as $CHECKOUT, if it does not exist locally, create it...
-	git checkout $CHECKOUT &>/dev/null || git checkout -b $CHECKOUT >/dev/null
-
-	# switch to a tmp branch...
-	git checkout -b tmp-$TIMESTAMP &>/dev/null
-
-	# pull $CHECKOUT from origin into the tmp branch
-	LANG=en_US.UTF-8 git pull origin $CHECKOUT 2>/dev/null | egrep "^Already up-to-date.$" &>/dev/null && {
-		# drop the tmp branch
-		git checkout $CURRENT_BRANCH &>/dev/null
-		git branch -D tmp-$TIMESTAMP >/dev/null
-		exit 1
-	} || {
-		# drop the tmp branch
-		git checkout $CURRENT_BRANCH &>/dev/null
-		git branch -D tmp-$TIMESTAMP >/dev/null
-		exit 0
-	}
-} || exit 0
diff --git a/bin/x2go-tarballrelease b/bin/x2go-tarballrelease
deleted file mode 100755
index 2779b60..0000000
--- a/bin/x2go-tarballrelease
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# Python X2go is free software; you can redistribute it and/or modify
-# it under the tBerms 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.
-#
-# Python X2go 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.
-
-# Thanks to Jonas Smedegaard <dr@jones.dk> for inspiration...
-
-set -e
-
-RELEASE="$1"
-test -n "$RELEASE" || { echo "usage: $(basename "$0") <release-version> [<checkout>]"; exit 1; }
-
-CHECKOUT="${2:-master}"
-
-PROJECT="$(basename $PWD)"
-TARGETDIR=".."
-
-MANIFEST="$(mktemp)"
-TEMP_DIR="$(mktemp -d)"
-
-echo $MANIFEST
-
-trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0
-git clone . "$TEMP_DIR/${PROJECT}_$RELEASE"
-( set -e; cd "$TEMP_DIR/${PROJECT}_$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true )
-( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}_$RELEASE/.git"* )
-( set -e; cd "$TEMP_DIR" && find "${PROJECT}_$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" )
-mkdir -p "$TARGETDIR/_releases_/source/${PROJECT}/"
-tar c -C "$TEMP_DIR" --owner 0 --group 0 --numeric-owner --no-recursion --files-from "$MANIFEST" | gzip -n > "$TARGETDIR/_releases_/source/${PROJECT}/${PROJECT}_$RELEASE.tar.gz"
-
-
-
-
diff --git a/bin/x2go-updatebuildmain b/bin/x2go-updatebuildmain
deleted file mode 100755
index 3716ed4..0000000
--- a/bin/x2go-updatebuildmain
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-#
-# Python X2go 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.
-#
-# Python X2go 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
-
-set -e
-
-GITPROJECT=$(basename $(pwd))
-REF=$1
-
-# we need to be within a working copy (base folder) and we need a <REF>!!!
-test -z $1 || test -d ./.git || {
-  echo "usage: $(basename $0) <REF>"
-  echo "Call this command from within the base folder of an X2go Git project's working copy..."
-  exit -1
-}
-
-# update the build-main branch with our newest blessed reference
-git branch build-main &>/dev/null || true
-git push origin $REF:build-main
diff --git a/bin/x2go-upload-all-packages b/bin/x2go-upload-all-packages
deleted file mode 120000
index b77cc44..0000000
--- a/bin/x2go-upload-all-packages
+++ /dev/null
@@ -1 +0,0 @@
-x2go-build-all-packages
\ No newline at end of file
diff --git a/bin/x2go-upload-package b/bin/x2go-upload-package
deleted file mode 120000
index b6ef03d..0000000
--- a/bin/x2go-upload-package
+++ /dev/null
@@ -1 +0,0 @@
-x2go-build-package
\ No newline at end of file