From d48b4bf31570862f67fff26b11ce05e6e9d1e255 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 20 Dec 2011 15:26:35 +0100
Subject: revert source format 3.0 (quilt) support, does not apply to our repos

---
 bin/itzks-build-package | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

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

diff --git a/bin/itzks-build-package b/bin/itzks-build-package
index d91979d..e010d6a 100755
--- a/bin/itzks-build-package
+++ b/bin/itzks-build-package
@@ -124,13 +124,6 @@ prepare_workspace() {
 
 	cd $PROJECT_DIR
 
-	test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
-		UPSTREAM_DFSG_VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
-		ORIG_DFSG_TARBALL="${PROJECT}_${UPSTREAM_DFSG_VERSION}.orig.tar.gz"
-		UPSTREAM_VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | sed 's,\(\.dfsg.*\),,' | cut -d"-" -f1`
-		ORIG_TARBALL="${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz"
-		git fetch origin pristine-tar:pristine-tar
-	}
 	# by default we build for all current debian versions
 	test -f BUILDS_FOR || cat > BUILDS_FOR <<EOF
 debian: squeeze wheezy sid
@@ -152,10 +145,9 @@ build_packages() {
 				cd $TEMP_DIR/$PROJECT
 				git checkout $CHECKOUT || git checkout master
 				GITREV=$(itzks-gitrevno)
-				test -n ${ORIG_TARBALL} && {
-					git fetch origin pristine-tar:pristine-tar
-					pristine-tar checkout ../${ORIG_TARBALL}
-					[ "x$ORIG_TARBALL" != "x$ORIG_DFSG_TARBALL" ] && mv ../${ORIG_TARBALL} ../${ORIG_DFSG_TARBALL}
+				# 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
 				}
 				# translate the version name for Debian releases
 				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
-- 
cgit v1.2.3