From a2e20e9ac6021d6d5f0f1cef440e1cbce216ed80 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 9 Mar 2017 10:48:24 +1300 Subject: [PATCH] Convert Zcash versions to Debian format --- doc/release-process.md | 2 +- zcutil/build-debian-package.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/release-process.md b/doc/release-process.md index f86e59933..3288ce9ec 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -81,7 +81,7 @@ Add the newly created release notes to the Git repository: Update the Debian package changelog: - export DEBVERSION="${ZCASH_RELEASE}" + export DEBVERSION=$(echo $ZCASH_RELEASE | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/') export DEBEMAIL="${DEBEMAIL:-team@z.cash}" export DEBFULLNAME="${DEBFULLNAME:-Zcash Company}" diff --git a/zcutil/build-debian-package.sh b/zcutil/build-debian-package.sh index 8c2d05c3f..694b74929 100755 --- a/zcutil/build-debian-package.sh +++ b/zcutil/build-debian-package.sh @@ -18,6 +18,7 @@ if [ ! -d $BUILD_PATH ]; then fi PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v) +DEBVERSION=$(echo $PACKAGE_VERSION | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/') BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64" if [ -d $BUILD_DIR ]; then @@ -63,7 +64,7 @@ cd $SRC_PATH/contrib # Create the control file dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli -dpkg-gencontrol -P$BUILD_DIR +dpkg-gencontrol -P$BUILD_DIR -v$DEBVERSION # Create the Debian package fakeroot dpkg-deb --build $BUILD_DIR