From 7cc72831ff00bb3720e9b321407f99508b52cadc Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 01:43:20 +0100
Subject: fix package upload

---
 bin/build-package | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 3a891b6..7cd3a1a 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -247,13 +247,13 @@ upload_packages() {
 			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 -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes"
+					ls *.changes &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME *.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 -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME "$PROJECT_*.changes"
+				ls *.changes &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME *.changes
 				cd -
 			done
 		done
-- 
cgit v1.2.3


From 88f055a30f600abfeff09e611ddbe863839b9085 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 01:54:28 +0100
Subject: fix package upload

---
 bin/build-package | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 7cd3a1a..ed3b1c3 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -127,6 +127,7 @@ clear_pkgdist() {
 				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/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"
@@ -137,6 +138,7 @@ clear_pkgdist() {
 				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"
@@ -247,13 +249,15 @@ upload_packages() {
 			if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then	
 				for l_ARCH in amd64 i386; do 
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
+					ln ~/.dupload.conf.$PREFIX ./dupload.conf
 					ls *.changes &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME *.changes
 					cd -
 				done
 			fi
 			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
 				cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH"
-				ls *.changes &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME *.changes
+				ln ~/.dupload.conf.$PREFIX ./dupload.conf
+				ls *.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME *.changes
 				cd -
 			done
 		done
-- 
cgit v1.2.3


From cdb45b8be9a37ad47f47e409a48f8f8b4cfd8bec Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:05:24 +0100
Subject: fix for dupload call

---
 bin/build-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index ed3b1c3..bbe0ff8 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -250,7 +250,7 @@ upload_packages() {
 				for l_ARCH in amd64 i386; do 
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 					ln ~/.dupload.conf.$PREFIX ./dupload.conf
-					ls *.changes &>/dev/null && dupload -c ~/.dupload.conf.$PREFIX --to $PREFIX-$l_DIST-$l_CODENAME *.changes
+					ls *.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME *.changes
 					cd -
 				done
 			fi
-- 
cgit v1.2.3


From c6d3589c78b29966a6e029261c96578bc7d1921d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:06:52 +0100
Subject: fix for dupload call (2)

---
 bin/build-package | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index bbe0ff8..5f68dab 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -249,14 +249,14 @@ upload_packages() {
 			if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then	
 				for l_ARCH in amd64 i386; do 
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
-					ln ~/.dupload.conf.$PREFIX ./dupload.conf
+					test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
 					ls *.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME *.changes
 					cd -
 				done
 			fi
 			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
 				cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH"
-				ln ~/.dupload.conf.$PREFIX ./dupload.conf
+				test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
 				ls *.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME *.changes
 				cd -
 			done
-- 
cgit v1.2.3


From 2696cdb736ab514d210f6126b7f2e66743cbdacd Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:20:01 +0100
Subject: fix upload

---
 bin/build-package | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 5f68dab..afde99f 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -250,14 +250,14 @@ upload_packages() {
 				for l_ARCH in amd64 i386; do 
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 					test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-					ls *.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME *.changes
+					ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$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"
 				test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-				ls *.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME *.changes
+				ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes
 				cd -
 			done
 		done
-- 
cgit v1.2.3


From fde062645a692b0b300be7c5960003f040465293 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:25:29 +0100
Subject: build packages for ubuntu properly

---
 bin/build-package | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index afde99f..2842bbc 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -177,6 +177,10 @@ build_packages() {
 				test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
 					echo "3.0 (native)" > debian/source/format
 				}
+
+				# for Ubuntu version is the codename of the distribution release
+				VERSION=$l_CODENAME
+
 				# translate the version name for Debian releases
 				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
 				[ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing
-- 
cgit v1.2.3


From d67f2370600a76b79f048317664f802cd594cd65 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:34:41 +0100
Subject: fix pkg-dist dir cleanup

---
 bin/build-package | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 2842bbc..b8c5ac1 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -128,23 +128,23 @@ clear_pkgdist() {
 					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/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"
+						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"
+					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
 		}
-- 
cgit v1.2.3


From bf9ebc577359da6d7ddff50f8f5a3fd9ec51cb1a Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:41:37 +0100
Subject: not using 'cd -' as it behaves weird in for loops

---
 bin/build-package | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index b8c5ac1..0d3f007 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -255,18 +255,15 @@ upload_packages() {
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 					test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
 					ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$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"
 				test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
 				ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes
-				cd -
 			done
 		done
 	done
-	cd -
 	return 0
 }
 
-- 
cgit v1.2.3


From d409c118b3c69f94a720029dc9df78c749d2f818 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Dec 2011 02:49:31 +0100
Subject: fix while loop + dupload

---
 bin/build-package | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 0d3f007..7d7977f 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -240,7 +240,6 @@ build_packages() {
 
 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 [:upper:] [:lower:])
 		l_CODENAMES=${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}
@@ -254,13 +253,13 @@ upload_packages() {
 				for l_ARCH in amd64 i386; do 
 					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 					test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-					ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes
+					ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
 				done
 			fi
 			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
 				cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH"
 				test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-				ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes
+				ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
 			done
 		done
 	done
-- 
cgit v1.2.3


From afb2b22095cbfbf5aeb04aefc224e0bb1bf21919 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 10 Jan 2012 16:05:26 +0100
Subject: update to HEAD by default

---
 bin/updatebuildmain | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/updatebuildmain b/bin/updatebuildmain
index f4f4917..1aca5e1 100755
--- a/bin/updatebuildmain
+++ b/bin/updatebuildmain
@@ -20,7 +20,7 @@
 set -e
 
 GITPROJECT=$(basename $(pwd))
-REF=$1
+REF=${1-HEAD}
 
 # we need to be within a working copy (base folder) and we need a <REF>!!!
 test -z $1 || test -d ./.git || {
@@ -30,5 +30,6 @@ test -z $1 || test -d ./.git || {
 }
 
 # update the build-main branch with our newest blessed reference
+git branch -D build-main &>/dev/null || true
 git branch build-main &>/dev/null || true
 git push origin $REF:build-main
-- 
cgit v1.2.3


From 899d3c0e68e10d343fb52ba26c3cd6bc61e634e9 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 18 Jan 2012 22:05:12 +0100
Subject: introduce a SKIP_ARCH environment variable

---
 bin/build-package | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 7d7977f..903fc40 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -201,10 +201,10 @@ build_packages() {
 				
 				[ "x$USE_SUDO" != "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "amd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
 							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" 0<&-
 						}
-						cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "i386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
 							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386"  -- --binary-arch 0<&-
 						}
 					}
@@ -217,10 +217,10 @@ build_packages() {
 				}
 				[ "x$USE_SUDO" = "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "amd64" ] && 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 $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 0<&-
 						}
-						cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "i386" ] && 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 $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch 0<&-
 						}
 					}
-- 
cgit v1.2.3


From 28dea91c42a72f04cb8e5c727626bc6b29895706 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 18 Jan 2012 22:05:56 +0100
Subject: typo fix

---
 bin/build-package | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 903fc40..dbf3293 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -201,10 +201,10 @@ build_packages() {
 				
 				[ "x$USE_SUDO" != "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						[ "x$SKIP_ARCH" != "amd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
 							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" 0<&-
 						}
-						[ "x$SKIP_ARCH" != "i386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
 							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386"  -- --binary-arch 0<&-
 						}
 					}
@@ -217,10 +217,10 @@ build_packages() {
 				}
 				[ "x$USE_SUDO" = "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						[ "x$SKIP_ARCH" != "amd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "xamd64" ] && 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 $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 0<&-
 						}
-						[ "x$SKIP_ARCH" != "i386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
+						[ "x$SKIP_ARCH" != "xi386" ] && 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 $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch 0<&-
 						}
 					}
-- 
cgit v1.2.3


From f0e5ce61c28180c380dc3921423aa9ea3ec9c02c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 18 Jan 2012 22:08:52 +0100
Subject: more SKIP_ARCH areas in code adapted

---
 bin/build-package | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index dbf3293..f0a4edb 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -126,14 +126,16 @@ clear_pkgdist() {
 
 				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/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
+						[ "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 
@@ -250,10 +252,12 @@ upload_packages() {
 			test -z $CODENAMES || echo $line | grep $CODENAMES || break
 
 			if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then	
-				for l_ARCH in amd64 i386; do 
-					cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
-					test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-					ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
+				for l_ARCH in amd64 i386; do
+					[ "x$SKIP_ARCH" != "x$l_ARCH" ] {
+						cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
+						test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
+						ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
+					}
 				done
 			fi
 			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
-- 
cgit v1.2.3


From 8ce1824780bb0c77df4e351009bdb5d1a5610651 Mon Sep 17 00:00:00 2001
From: X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de>
Date: Wed, 18 Jan 2012 22:11:13 +0100
Subject: add orig.tar.gz file support, if exists...

---
 bin/build-package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 7d7977f..bfc6e2a 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -172,11 +172,12 @@ build_packages() {
 				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)
 				# 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
-				}
+			        }	
 
 				# for Ubuntu version is the codename of the distribution release
 				VERSION=$l_CODENAME
-- 
cgit v1.2.3


From 146ca95e1971f3ddeb4819f22f1e97a07a659113 Mon Sep 17 00:00:00 2001
From: X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de>
Date: Wed, 18 Jan 2012 22:16:22 +0100
Subject: syntax fix

---
 bin/build-package | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/build-package b/bin/build-package
index 9c5c109..f1c24de 100755
--- a/bin/build-package
+++ b/bin/build-package
@@ -126,7 +126,7 @@ clear_pkgdist() {
 
 				if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then
 					for l_ARCH in amd64 i386; do
-						[ "x$SKIP_ARCH" != "x$l_ARCH" ] {
+						[ "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
@@ -254,7 +254,7 @@ upload_packages() {
 
 			if [ "x$EXTRA_ARCHS_ONLY" = "x" ]; then	
 				for l_ARCH in amd64 i386; do
-					[ "x$SKIP_ARCH" != "x$l_ARCH" ] {
+					[ "x$SKIP_ARCH" != "x$l_ARCH" ] && {
 						cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
 						test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
 						ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
-- 
cgit v1.2.3