diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-20 14:15:46 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-20 14:15:46 +0100 |
| commit | cba9a1ba1606a27e1cf02ff3a449ae5b713c9198 (patch) | |
| tree | 21b987695fc98ada5c57374d9f4db4c39212216c | |
| parent | 519e9fb1f30d73e9487fc848d0465c841b1910d3 (diff) | |
| download | buildscripts-cba9a1ba1606a27e1cf02ff3a449ae5b713c9198.tar.gz buildscripts-cba9a1ba1606a27e1cf02ff3a449ae5b713c9198.tar.bz2 buildscripts-cba9a1ba1606a27e1cf02ff3a449ae5b713c9198.zip | |
more dfsg support fixes
| -rwxr-xr-x | bin/itzks-build-package | 8 |
1 files changed, 7 insertions, 1 deletions
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 |