replaced buildscripts with those form NWT build site

8 files changed, 261 insertions, 68 deletions

diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf
new file mode 100644
index 0000000..5fd406c
--- /dev/null
+++ b/home/.buildscripts/itzks.conf
@@ -0,0 +1,33 @@
+# 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"
+
+DISTS_SUPPORTED="debian ubuntu"
+BUILDS_FOR="\
+debian: lenny squeeze wheezy sid\n\
+ubuntu: lucid precise"
+
+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
new file mode 100644
index 0000000..8673e0f
--- /dev/null
+++ b/home/.buildscripts/nwt.conf
@@ -0,0 +1,42 @@
+# 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"
+DISTS_SUPPORTED="debian ubuntu"
+BUILDS_FOR="\
+debian: lenny squeeze wheezy sid\n\
+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
new file mode 100644
index 0000000..e170ff4
--- /dev/null
+++ b/home/.buildscripts/x2go.conf
@@ -0,0 +1,54 @@
+# 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"
+DISTS_SUPPORTED="debian"
+BUILDS_FOR="\
+debian: squeeze wheezy sid"
+
+COMPONENT_MAIN="main"
+COMPONENT_NIGHTLY="heuler"
+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\
+"
+LIB_PACKAGES_MAIN="
+x2go-keyring $COMPONENT_MAIN build-main\n\
+nx-libs $COMPONENT_MAIN build-main\n\
+python-x2go $COMPONENT_MAIN build-main\
+"
+APP_PACKAGES_NIGHTLY="
+x2goserver $COMPONENT_NIGHTLY master\n\
+x2goagent $COMPONENT_NIGHTLY master\n\
+x2goclient $COMPONENT_NIGHTLY master\n\
+cups-x2go $COMPONENT_NIGHTLY master\n\
+x2godesktopsharing $COMPONENT_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_NIGHTLY="
+x2goserver $COMPONENT_MAIN build-main\n\
+x2goagent $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\
+"
diff --git a/home/.dupload.conf b/home/.dupload.conf
index 7e25854..8e68292 100644
--- a/home/.dupload.conf
+++ b/home/.dupload.conf
@@ -1,36 +1,36 @@
 package config;
 
-### itzks/DEBIAN
-$cfg{"itzks-debian-sid"} = {
-        fqdn => "packages.it-zukunft-schule.de",
-        login => "itzks-admin",
+### X2go/DEBIAN
+$cfg{"x2go-debian-sid"} = {
+        fqdn => "code.x2go.org",
+        login => "x2go-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",
+        incoming => "/srv/sites/x2go.org/packages/debian/incoming/sid",
+        queuedir => "/srv/sites/x2go.org/packages/debian/upload/sid",
         dinstall_runs => 1,
 };
-$cfg{"itzks-debian-wheezy"} = {
-        fqdn => "packages.it-zukunft-schule.de",
-        login => "itzks-admin",
+$cfg{"x2go-debian-wheezy"} = {
+        fqdn => "code.x2go.org",
+        login => "x2go-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",
+        incoming => "/srv/sites/x2go.org/packages/debian/incoming/wheezy",
+        queuedir => "/srv/sites/x2go.org/packages/debian/upload/wheezy",
         dinstall_runs => 1,
 };
-$cfg{"itzks-debian-squeeze"} = {
-        fqdn => "packages.it-zukunft-schule.de",
-        login => "itzks-admin",
+$cfg{"x2go-debian-squeeze"} = {
+        fqdn => "code.x2go.org",
+        login => "x2go-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",
+        incoming => "/srv/sites/x2go.org/packages/debian/incoming/squeeze",
+        queuedir => "/srv/sites/x2go.org/packages/debian/upload/squeeze",
         dinstall_runs => 1,
 };
-$cfg{"itzks-debian-lenny"} = {
-        fqdn => "packages.it-zukunft-schule.de",
-        login => "itzks-admin",
+$cfg{"x2go-debian-lenny"} = {
+        fqdn => "code.x2go.org",
+        login => "x2go-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",
+        incoming => "/srv/sites/x2go.org/packages/debian/incoming/lenny",
+        queuedir => "/srv/sites/x2go.org/packages/debian/upload/lenny",
         dinstall_runs => 1,
 };
 
diff --git a/home/.dupload.conf.itzks b/home/.dupload.conf.itzks
new file mode 100644
index 0000000..7e25854
--- /dev/null
+++ b/home/.dupload.conf.itzks
@@ -0,0 +1,37 @@
+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-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
new file mode 100644
index 0000000..d4ba622
--- /dev/null
+++ b/home/.dupload.conf.nwt
@@ -0,0 +1,37 @@
+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-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,
+};
+
+1;
diff --git a/home/.dupload.conf.x2go b/home/.dupload.conf.x2go
new file mode 100644
index 0000000..8e68292
--- /dev/null
+++ b/home/.dupload.conf.x2go
@@ -0,0 +1,37 @@
+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-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 f620a90..0000000
--- a/home/.pbuilderrc
+++ /dev/null
@@ -1,47 +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=itzks-admin
-BUILDRESULTGID=itzks
-# 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"
-KERNEL_IMAGE=/srv/pbuilder/qemu-kernels/$ARCH/vmlinuz
-ARCH_DISKDEVICE=sd
-if [ "x$ARCH" = "xarmel" ]; then
-	MEMORY_MEGS=256
-	INITRD=""
-else
-	MEMORY_MEGS=512
-	INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img
-fi
-
-if [ "x${DIST}" = "xubuntu" ]; then 
-        MIRRORSITE="http://localhost:3142/ubuntu"
-elif [ "x${DIST}" = "xdebian" ]; then
-        MIRRORSITE="http://localhost:3142/debian"
-fi