From 42eb8e16ce40995612c0350335ec76673e8312fa Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 20 Dec 2011 13:35:55 +0100
Subject: checkout the orig tarball from the tmp git project, not from the
 maser copy

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

(limited to 'bin/itzks-build-package')

diff --git a/bin/itzks-build-package b/bin/itzks-build-package
index b0a339e..8ba6afb 100755
--- a/bin/itzks-build-package
+++ b/bin/itzks-build-package
@@ -121,12 +121,12 @@ prepare_workspace() {
 		cd $PROJECT 
 		git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT;
 	fi
+
 	cd $PROJECT_DIR
 
 	test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
 		UPSTREAM_VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | sed 's,\(\.dfsg.*\),,' | cut -d"-" -f1`
 		ORIG_TARBALL="${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz"
-		pristine-tar checkout ../${ORIG_TARBALL}
 	}
 	# by default we build for all current debian versions
 	test -f BUILDS_FOR || cat > BUILDS_FOR <<EOF
@@ -149,6 +149,8 @@ build_packages() {
 				cd $TEMP_DIR/$PROJECT
 				git checkout $CHECKOUT || git checkout master
 				GITREV=$(itzks-gitrevno)
+				test -n ${ORIG_TARBALL} && pristine-tar checkout ../${ORIG_TARBALL}
+				}
 				# translate the version name for Debian releases
 				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
 				[ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing
-- 
cgit v1.2.3