From 861c89ae40cf616b8d7af1c6ec78bf11f4c821d1 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 17 Feb 2017 13:33:11 -0800 Subject: [PATCH 1/2] Closes #2083 and #2088. Update release process documentation --- doc/release-process.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/release-process.md b/doc/release-process.md index 41151cb1..2ddfcf73 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -37,11 +37,12 @@ previous release: configure.ac contrib/gitian-descriptors/gitian-linux.yml - Build and commit to update versions, and then perform the following commands: +Build and commit to update versions, and then perform the following commands: - help2man -n "RPC client for the Zcash daemon" src/zcash-cli > contrib/DEBIAN/manpages/zcash-cli.1 - help2man -n "Network daemon for interacting with the Zcash blockchain" src/zcashd > contrib/DEBIAN/manpages/zcashd.1 + help2man -n "RPC client for the Zcash daemon" src/zcash-cli > contrib/debian/manpages/zcash-cli.1 + help2man -n "Network daemon for interacting with the Zcash blockchain" src/zcashd > contrib/debian/manpages/zcashd.1 +Check the version number in the man pages as they use the commit id e.g. 1.0.6-xxxxxxx which may need to be manually cleaned up. In `configure.ac` and `clientversion.h`: @@ -56,22 +57,23 @@ In `configure.ac` and `clientversion.h`: - Change `CLIENT_VERSION_IS_RELEASE` to false while Zcash is in beta-test phase. -If this release changes the behavior of the protocol or fixes a serious bug, we may -also wish to change the `PROTOCOL_VERSION` in `version.h`. - ### B2. Write release notes Run the release-notes.py script to generate release notes and update authors.md file. For example: $ python zcutil/release-notes.py --version $ZCASH_RELEASE +Add the newly created release notes to the Git repository: + + $ git add doc/release-notes/release-notes-$ZCASH_RELEASE.md + Update the Debian package changelog: export DEBVERSION="${ZCASH_RELEASE}" export DEBEMAIL="${DEBEMAIL:-team@z.cash}" export DEBFULLNAME="${DEBFULLNAME:-Zcash Company}" - dch -v $DEBVERSION -D jessie -c contrib/DEBIAN/changelog + dch -v $DEBVERSION -D jessie -c contrib/debian/changelog (`dch` comes from the devscripts package.) From 58582925d8bba2ead103bfc2c2291bc12da62cb4 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 17 Feb 2017 13:34:57 -0800 Subject: [PATCH 2/2] Closes #2084. Fix incorrect year in timestamp. --- contrib/debian/changelog | 2 +- doc/release-process.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 4ae3c4ae..eba96c76 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -8,7 +8,7 @@ zcash (1.0.5) jessie; urgency=medium * 1.0.5 release. - -- Zcash Company Thu, 19 Jan 2016 19:23:40 -0700 + -- Zcash Company Thu, 19 Jan 2017 19:23:40 -0700 zcash (1.0.4) jessie; urgency=medium diff --git a/doc/release-process.md b/doc/release-process.md index 2ddfcf73..6d8543a6 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -42,7 +42,7 @@ Build and commit to update versions, and then perform the following commands: help2man -n "RPC client for the Zcash daemon" src/zcash-cli > contrib/debian/manpages/zcash-cli.1 help2man -n "Network daemon for interacting with the Zcash blockchain" src/zcashd > contrib/debian/manpages/zcashd.1 -Check the version number in the man pages as they use the commit id e.g. 1.0.6-xxxxxxx which may need to be manually cleaned up. +Check the version number in the man pages as they use the commit id e.g. 1.0.6-xxxxxxx which may need to be manually cleaned up. Also check the titles use "zcashd" and "zcash-cli", not "zcash". In `configure.ac` and `clientversion.h`: @@ -57,6 +57,9 @@ In `configure.ac` and `clientversion.h`: - Change `CLIENT_VERSION_IS_RELEASE` to false while Zcash is in beta-test phase. +If this release changes the behavior of the protocol or fixes a serious bug, we may +also wish to change the `PROTOCOL_VERSION` in `version.h`. + ### B2. Write release notes Run the release-notes.py script to generate release notes and update authors.md file. For example: