The branch, master has been updated via 98940a3a6fbeffa94548f314b3996ddbcbc129f5 (commit) from 63edba4964c723d4116dc6daeb476d1c5e5d8480 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 98940a3a6fbeffa94548f314b3996ddbcbc129f5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 30 20:52:37 2013 +0100 rename RPM_BUILDS_FOR/DEB_BUILDS_FOR to RPM_BUILD_FOR/DEB_BUILD_FOR ----------------------------------------------------------------------- Summary of changes: bin/build-deb-package | 12 ++++++------ bin/build-rpm-package | 12 ++++++------ home/.buildscripts/itzks.conf | 2 +- home/.buildscripts/nwt.conf | 2 +- home/.buildscripts/x2go.conf | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/bin/build-deb-package b/bin/build-deb-package index 233a936..7de31fd 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -37,7 +37,7 @@ PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME=$HOME/.gnupg FORCE_BUILD=${FORCE_BUILD:-"no"} -DEB_BUILDS_FOR=${DEB_BUILDS_FOR:-"debian:$DEBIAN_DISTROS ubuntu:$UBUNTU_DISTROS"} +DEB_BUILD_FOR=${DEB_BUILD_FOR:-"debian:$DEBIAN_DISTROS ubuntu:$UBUNTU_DISTROS"} test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } @@ -122,9 +122,9 @@ prepare_workspace() { # by default we build for all current debian versions if [ -n $ARGV2_CODENAME ]; then if echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then - DEB_BUILDS_FOR="debian:$ARGV2_CODENAME" + DEB_BUILD_FOR="debian:$ARGV2_CODENAME" elif echo "$UBUNTU_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then - DEB_BUILDS_FOR="ubuntu:$ARGV2_CODENAME" + DEB_BUILD_FOR="ubuntu:$ARGV2_CODENAME" fi fi return 0 @@ -132,7 +132,7 @@ prepare_workspace() { clear_pkgdist() { # pkgdist directory cleanup - echo "$DEB_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do + echo "$DEB_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 "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { @@ -174,7 +174,7 @@ clear_pkgdist() { build_packages() { # use pbuilder for building all variants of this package - echo "$DEB_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do + echo "$DEB_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 "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { @@ -282,7 +282,7 @@ build_packages() { upload_packages() { # dupload the new packages to the reprepro repository - echo "$DEB_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do + echo "$DEB_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:])}" for l_CODENAME in $l_CODENAMES; do diff --git a/bin/build-rpm-package b/bin/build-rpm-package index a011062..5459781 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -38,7 +38,7 @@ PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME=$HOME/.gnupg FORCE_BUILD=${FORCE_BUILD:-"no"} -RPM_BUILDS_FOR=${RPM_BUILDS_FOR:-"fedora:$FEDORA_DISTROS epel:$EPEL_DISTROS"} +RPM_BUILD_FOR=${RPM_BUILD_FOR:-"fedora:$FEDORA_DISTROS epel:$EPEL_DISTROS"} test -z $1 && { echo "usage: $(basename $0) [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit -1; } @@ -118,9 +118,9 @@ prepare_workspace() { if [ -n "$ARGV2_CODENAME" ]; then if echo "$FEDORA_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then - RPM_BUILDS_FOR="fedora:$ARGV2_CODENAME" + RPM_BUILD_FOR="fedora:$ARGV2_CODENAME" elif echo "$EPEL_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then - RPM_BUILDS_FOR="epel:$ARGV2_CODENAME" + RPM_BUILD_FOR="epel:$ARGV2_CODENAME" fi fi return 0 @@ -128,7 +128,7 @@ prepare_workspace() { clear_pkgdist() { # pkgdist directory cleanup - echo "$RPM_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do + echo "$RPM_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 "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { @@ -188,7 +188,7 @@ build_packages() { # clean up the Git clone from the temp folder cd && rm $TEMP_DIR/$PROJECT -Rf - echo "$RPM_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do + echo "$RPM_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 "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && { @@ -229,7 +229,7 @@ build_packages() { upload_packages() { # dupload the new packages to the reprepro repository - echo "$RPM_BUILDS_FOR" | sed -e 's/ /\n/g' | while read line; do + echo "$RPM_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:])}" for l_CODENAME in $l_CODENAMES; do diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf index d3930d5..91e271b 100644 --- a/home/.buildscripts/itzks.conf +++ b/home/.buildscripts/itzks.conf @@ -8,7 +8,7 @@ DEBFULLNAME="ITZKS Packages" GPG_KEY="E41B37C658842183" DISTS_SUPPORTED="debian ubuntu" -DEB_BUILDS_FOR="debian:squeeze,wheezy,jessie,sid" +DEB_BUILD_FOR="debian:squeeze,wheezy,jessie,sid" COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf index ad7a791..ac04488 100644 --- a/home/.buildscripts/nwt.conf +++ b/home/.buildscripts/nwt.conf @@ -8,7 +8,7 @@ DEBEMAIL=debian@das-netzwerkteam.de DEBFULLNAME="NWT Packages" GPG_KEY="4DC41CF116990FF8" DISTS_SUPPORTED="debian ubuntu" -DEB_BUILDS_FOR="debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise" +DEB_BUILD_FOR="debian:lenny,squeeze,wheezy,jessie,sid ubuntu:lucid,precise" COMPONENT_MAIN="main" COMPONENT_NIGHTLY="nightly" diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index 3c3d6d3..3373649 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -8,13 +8,13 @@ DEBEMAIL=git-admin@x2go.org DEBFULLNAME="X2go Git Administrator" GPG_KEY="F4A7678C9C6B0B2B" DISTS_SUPPORTED="debian" -DEB_BUILDS_FOR="debian:squeeze,wheezy,jessie,sid" +DEB_BUILD_FOR="debian:squeeze,wheezy,jessie,sid" RPMEMAIL=git-admin@x2go.org RPMFULLNAME="X2go Git Administrator" GPG_KEY="F4A7678C9C6B0B2B" DISTS_SUPPORTED="fedora epel" -RPM_BUILDS_FOR="fedora:18,19,20,rawhide epel:6" +RPM_BUILD_FOR="fedora:18,19,20,rawhide epel:6" RPM_REPOS_BASE=/srv/sites/x2go.org/packages/ COMPONENT_MAIN="main" hooks/post-receive -- buildscripts.git (X2Go packaging scripts) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (X2Go packaging scripts).