From e70c8d2ea31c0d55b46c411c28eb9a03c665b824 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Nov 2017 17:49:28 +0000 Subject: [PATCH 1/3] make-release.py: Versioning changes for 1.0.13-rc2. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 88774bb0d..42e3f77f6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.13-rc1 +Zcash 1.0.13-rc2 ============= What is Zcash? diff --git a/configure.ac b/configure.ac index 8d18fb2a9..ce3303da4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 13) -define(_CLIENT_VERSION_BUILD, 25) +define(_CLIENT_VERSION_BUILD, 26) 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))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index d558f0b75..e78daa268 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.13-rc1" +name: "zcash-1.0.13-rc2" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 5ed4e142a..cd9919938 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 13 -#define CLIENT_VERSION_BUILD 25 +#define CLIENT_VERSION_BUILD 26 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/deprecation.h b/src/deprecation.h index 7ef715539..530de67b9 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -8,7 +8,7 @@ // Deprecation policy: // * Shut down 16 weeks' worth of blocks after the estimated release block height. // * A warning is shown during the 2 weeks' worth of blocks prior to shut down. -static const int APPROX_RELEASE_HEIGHT = 219700; +static const int APPROX_RELEASE_HEIGHT = 221270; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From 562b55bec1a01b520064973ffa2ce65dfa89fcc0 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Nov 2017 18:00:32 +0000 Subject: [PATCH 2/3] make-release.py: Updated manpages for 1.0.13-rc2. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 184c07d07..4d6081d3f 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" "November 2017" "zcash-cli v1.0.13-rc1" "User Commands" +.TH ZCASH-CLI "1" "November 2017" "zcash-cli v1.0.13-rc2" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.13-rc1 +zcash-cli \- manual page for zcash-cli v1.0.13-rc2 .SH DESCRIPTION -Zcash RPC client version v1.0.13\-rc1 +Zcash RPC client version v1.0.13\-rc2 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index ecdfcc54d..4baa0cd59 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" "November 2017" "zcash-tx v1.0.13-rc1" "User Commands" +.TH ZCASH-TX "1" "November 2017" "zcash-tx v1.0.13-rc2" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.13-rc1 +zcash-tx \- manual page for zcash-tx v1.0.13-rc2 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.13\-rc1 +Zcash zcash\-tx utility version v1.0.13\-rc2 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 73fb71760..d39345c68 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" "November 2017" "zcashd v1.0.13-rc1" "User Commands" +.TH ZCASHD "1" "November 2017" "zcashd v1.0.13-rc2" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.13-rc1 +zcashd \- manual page for zcashd v1.0.13-rc2 .SH DESCRIPTION -Zcash Daemon version v1.0.13\-rc1 +Zcash Daemon version v1.0.13\-rc2 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -54,7 +54,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13\-rc1) +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13\-rc2) .HP \fB\-exportdir=\fR .IP From 48ea914cd0ab31de322223a36ea6c07b108655e6 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 17 Nov 2017 18:01:08 +0000 Subject: [PATCH 3/3] make-release.py: Updated release notes and changelog for 1.0.13-rc2. --- contrib/debian/changelog | 6 ++++++ doc/authors.md | 2 +- doc/release-notes/release-notes-1.0.13-rc2.md | 11 +++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/release-notes-1.0.13-rc2.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index f5e93234b..835748fcb 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.13~rc2) stable; urgency=medium + + * 1.0.13-rc2 release. + + -- Zcash Company Fri, 17 Nov 2017 18:01:08 +0000 + zcash (1.0.13~rc1) stable; urgency=medium * 1.0.13-rc1 release. diff --git a/doc/authors.md b/doc/authors.md index b57e6e8ad..2dbe9f661 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,7 +1,7 @@ Zcash Contributors ================== -Jack Grigg (506) +Jack Grigg (512) Simon Liu (281) Sean Bowe (193) Daira Hopwood (102) diff --git a/doc/release-notes/release-notes-1.0.13-rc2.md b/doc/release-notes/release-notes-1.0.13-rc2.md new file mode 100644 index 000000000..0b60ffc9a --- /dev/null +++ b/doc/release-notes/release-notes-1.0.13-rc2.md @@ -0,0 +1,11 @@ +Changelog +========= + +Jack Grigg (6): + Move libsnark from DIST_SUBDIRS into EXTRA_DIST + Pass correct dependencies path to libsnark from both Gitian and build.sh + Mark libsnark includes as library includes + Add the tar-pax option to automake + make-release.py: Versioning changes for 1.0.13-rc2. + make-release.py: Updated manpages for 1.0.13-rc2. +