buildscripts.git - master (branch) updated: f4331ab1477831b4f69938d3134d9fe7a167bdf9 - x2go-commits

6 Apr 2012

The branch, master has been updated
       via  f4331ab1477831b4f69938d3134d9fe7a167bdf9 (commit)
       via  f277336772b21b7e39126b2f5cd4a1e47f7cc264 (commit)
      from  6173a37e64502a3da443cc33de91fb14358bd035 (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 f4331ab1477831b4f69938d3134d9fe7a167bdf9
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Apr 6 14:50:16 2012 +0200

    add detection code for BUILDS_FOR file

commit f277336772b21b7e39126b2f5cd4a1e47f7cc264
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Apr 6 14:49:08 2012 +0200

    fix build of lenny packages, Debian lenny is now only available via archive.debian.org

-----------------------------------------------------------------------

Summary of changes:
 bin/build-package |   10 +++++++++-
 home/.pbuilderrc  |    7 ++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/bin/build-package b/bin/build-package
index 4b0ed8c..3e15745 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -24,6 +24,8 @@ DEBEMAIL="firstname.lastname@mydomain.org"
 DEBFULLNAME="Firstname Lastname"
 GPG_KEY=
 DISTS_SUPPORTED="debian ubuntu"
+DEBIAN_DISTROS="lenny squeeze wheezy sid"
+UBUNTU_DISTROS="lucid maverick natty oneiric precise"
 BUILDS_FOR="\
 debian: squeeze wheezy sid\n\
 ubuntu: lucid precise\n\
@@ -109,7 +111,13 @@ prepare_workspace() {
 	cd "$PROJECT_DIR"
 
 	# by default we build for all current debian versions
-	test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR
+	if test -z $ARGV2_CODENAME; then
+		test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR
+	elif echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
+		echo "debian: $ARGV2_CODENAME" > BUILDS_FOR
+	elif echo "$UBUNUT_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
+		echo "ubuntu: $ARGV2_CODENAME" >/dev/null
+	fi
 	return 0
 }
 
diff --git a/home/.pbuilderrc b/home/.pbuilderrc
index f52a77f..7043228 100644
--- a/home/.pbuilderrc
+++ b/home/.pbuilderrc
@@ -37,6 +37,7 @@ if [ "x$ARCH" = "xarmel" ]; then
 	MEMORY_MEGS=256
 	INITRD=""
 else
+	SMP="2"
 	MEMORY_MEGS=512
 	INITRD=/srv/pbuilder/qemu-kernels/$ARCH/initrd.img
 fi
@@ -44,6 +45,10 @@ fi
 if [ "x${DIST}" = "xubuntu" ]; then 
         MIRRORSITE="http://localhost:3142/ubuntu"
 elif [ "x${DIST}" = "xdebian" ]; then
-        MIRRORSITE="http://localhost:3142/debian"
+	if [ "x${CODENAME}" = "xlenny" ]; then
+		MIRRORSITE="http://localhost:3142/archive.debian.org/debian"
+	else
+	        MIRRORSITE="http://localhost:3142/debian"
+	fi
 fi
 


hooks/post-receive
-- 
buildscripts.git (buildscripts upstream project)

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" (buildscripts upstream project).

    