From a83f0677b4d2cda1f5bc779630d58478d4673267 Mon Sep 17 00:00:00 2001 From: Jay Graber Date: Fri, 3 Mar 2017 20:37:33 -0800 Subject: [PATCH] Update release to 1.0.7, generate manpages --- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 3 +-- doc/man/zcash-cli.1 | 8 ++++---- doc/man/zcash-tx.1 | 8 ++++---- doc/man/zcashd.1 | 10 +++++----- src/clientversion.h | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 84c66624b1..08e15a81ea 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 6) +define(_CLIENT_VERSION_REVISION, 7) define(_CLIENT_VERSION_BUILD, 50) define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 1566676127..0315b1ed2e 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.6" +name: "zcash-1.0.7" enable_cache: true distro: "debian" suites: @@ -134,4 +134,3 @@ script: | mv $SOURCEDIST $OUTDIR/src mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.tar.gz ${OUTDIR}/${DISTNAME}-linux64-debug.tar.gz mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-linux64.tar.gz - diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 00197e3873..4ab5190885 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-CLI "1" "February 2017" "zcash-cli v1.0.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH ZCASH-CLI "1" "March 2017" "zcash-cli v1.0.7" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.6 +zcash-cli \- manual page for zcash-cli v1.0.7 .SH DESCRIPTION -Zcash RPC client version v1.0.6\-dirty +Zcash RPC client version v1.0.7 .SS "Usage:" .TP zcash\-cli [options] [params] diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 02ec5471bf..9d5bc48e5b 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-TX "1" "February 2017" "zcash-tx v1.0.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH ZCASH-TX "1" "March 2017" "zcash-tx v1.0.7" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.6 +zcash-tx \- manual page for zcash-tx v1.0.7 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.6\-dirty +Zcash zcash\-tx utility version v1.0.7 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index d0f65e51ff..c2bb4f77e8 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASHD "1" "February 2017" "zcashd v1.0.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH ZCASHD "1" "March 2017" "zcashd v1.0.7" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.6 +zcashd \- manual page for zcashd v1.0.7 .SH DESCRIPTION -Zcash Daemon version v1.0.6\-dirty +Zcash Daemon version v1.0.7 .SS "Usage:" .TP zcashd [options] @@ -318,7 +318,7 @@ Prepend debug output with timestamp (default: 1) \fB\-minrelaytxfee=\fR .IP Fees (in BTC/Kb) smaller than this are considered zero fee for relaying -(default: 0.00001) +(default: 0.000001) .HP \fB\-printtoconsole\fR .IP diff --git a/src/clientversion.h b/src/clientversion.h index 124050296e..e8ef48b6bd 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -16,7 +16,7 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 6 +#define CLIENT_VERSION_REVISION 7 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build