From d4fcec5b9fa5f712c4dccaf025769a3af36f70ae Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 9 Jul 2015 18:55:52 +0100 Subject: [PATCH] debian build script fails more gracefully --- debian.sh | 24 +++++++++++++++++++++++- debian/changelog | 8 +++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/debian.sh b/debian.sh index f454d7cb..fc173c0d 100755 --- a/debian.sh +++ b/debian.sh @@ -2,7 +2,7 @@ APP=freedombone PREV_VERSION=1.00 -VERSION=1.00 +VERSION=1.01 ARCH_TYPE="all" DIR=${APP}-${VERSION} @@ -13,7 +13,10 @@ sed -i 's/VERSION="'${PREV_VERSION}'"/VERSION="'${VERSION}'"/g' src/freedombone- sed -i 's/VERSION="'${PREV_VERSION}'"/VERSION="'${VERSION}'"/g' src/freedombone-client # change the parent directory name to debian format +cp releases/* .. +mv releases /tmp/freedombone mv ../${APP} ../${DIR} +mkdir /tmp/freedombone # Create a source archive make clean @@ -21,10 +24,29 @@ make source # Build the package dpkg-buildpackage -F +if [ ! "$?" = "0" ]; then + mv ../${DIR} ../${APP} + mv /tmp/freedombone/releases . + exit 478 +fi # sign files gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb +if [ ! "$?" = "0" ]; then + mv ../${DIR} ../${APP} + mv /tmp/freedombone/releases . + exit 639 +fi + gpg -ba ../${APP}_${VERSION}.orig.tar.gz +if [ ! "$?" = "0" ]; then + mv ../${DIR} ../${APP} + mv /tmp/freedombone/releases . + exit 592 +fi # restore the parent directory name mv ../${DIR} ../${APP} +mv /tmp/freedombone/releases . + +exit 0 diff --git a/debian/changelog b/debian/changelog index 40388ae0..00bd7d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -freedombone (1.00-1) jessie; urgency=low +freedombone (1.01-1) stable; urgency=low - * Initial package + * Fixed restore script + * Social key management + * Create reciprocal backup accounts - -- Bob Mottram (4096 bits) Fri, 16 Jan 2015 21:19:00 +0100 + -- Bob Mottram (4096 bits) Thu, 09 Jul 2015 15:49:00 +0100