summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-20 13:35:55 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-20 13:35:55 +0100
commit42eb8e16ce40995612c0350335ec76673e8312fa (patch)
tree22b40630ba099ef9a01ed66186e39ee2921feb88
parent59de53e0cb82183f8f0df18cc47a3d64bb9846de (diff)
downloadbuildscripts-42eb8e16ce40995612c0350335ec76673e8312fa.tar.gz
buildscripts-42eb8e16ce40995612c0350335ec76673e8312fa.tar.bz2
buildscripts-42eb8e16ce40995612c0350335ec76673e8312fa.zip
checkout the orig tarball from the tmp git project, not from the maser copy
-rwxr-xr-xbin/itzks-build-package4
1 files changed, 3 insertions, 1 deletions
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