From cba9a1ba1606a27e1cf02ff3a449ae5b713c9198 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 20 Dec 2011 14:15:46 +0100
Subject: more dfsg support fixes

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

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

diff --git a/bin/itzks-build-package b/bin/itzks-build-package
index 4d6c0b0..d91979d 100755
--- a/bin/itzks-build-package
+++ b/bin/itzks-build-package
@@ -125,6 +125,8 @@ 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
@@ -150,7 +152,11 @@ 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}
+				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}
+				}
 				# translate the version name for Debian releases
 				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
 				[ "x$l_CODENAME" = "xwheezy" ] && VERSION=testing
-- 
cgit v1.2.3