Auto merge of #2585 - str4d:release-v1.0.11, r=str4d

Release v1.0.11
This commit is contained in:
Homu 2017-08-15 09:22:56 -07:00
commit 02dd675a25
11 changed files with 29 additions and 16 deletions

View File

@ -1,4 +1,4 @@
Zcash 1.0.11-rc1 Zcash 1.0.11
============= =============
What is Zcash? What is Zcash?

View File

@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 11) define(_CLIENT_VERSION_REVISION, 11)
define(_CLIENT_VERSION_BUILD, 25) 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(_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_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) define(_CLIENT_VERSION_IS_RELEASE, true)

View File

@ -1,3 +1,9 @@
zcash (1.0.11) stable; urgency=medium
* 1.0.11 release.
-- Zcash Company <team@z.cash> Tue, 15 Aug 2017 10:06:25 +0100
zcash (1.0.11~rc1) stable; urgency=medium zcash (1.0.11~rc1) stable; urgency=medium
* 1.0.11-rc1 release. * 1.0.11-rc1 release.

View File

@ -1,5 +1,5 @@
--- ---
name: "zcash-1.0.11-rc1" name: "zcash-1.0.11"
enable_cache: true enable_cache: true
distro: "debian" distro: "debian"
suites: suites:

View File

@ -1,7 +1,7 @@
Zcash Contributors Zcash Contributors
================== ==================
Jack Grigg (443) Jack Grigg (445)
Simon Liu (269) Simon Liu (269)
Sean Bowe (188) Sean Bowe (188)
Daira Hopwood (102) Daira Hopwood (102)

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11-rc1" "User Commands" .TH ZCASH-CLI "1" "August 2017" "zcash-cli v1.0.11" "User Commands"
.SH NAME .SH NAME
zcash-cli \- manual page for zcash-cli v1.0.11-rc1 zcash-cli \- manual page for zcash-cli v1.0.11
.SH DESCRIPTION .SH DESCRIPTION
Zcash RPC client version v1.0.11\-rc1 Zcash RPC client version v1.0.11
.PP .PP
In order to ensure you are adequately protecting your privacy when using Zcash, In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>. please see <https://z.cash/support/security/index.html>.

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11-rc1" "User Commands" .TH ZCASH-TX "1" "August 2017" "zcash-tx v1.0.11" "User Commands"
.SH NAME .SH NAME
zcash-tx \- manual page for zcash-tx v1.0.11-rc1 zcash-tx \- manual page for zcash-tx v1.0.11
.SH DESCRIPTION .SH DESCRIPTION
Zcash zcash\-tx utility version v1.0.11\-rc1 Zcash zcash\-tx utility version v1.0.11
.SS "Usage:" .SS "Usage:"
.TP .TP
zcash\-tx [options] <hex\-tx> [commands] zcash\-tx [options] <hex\-tx> [commands]

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASHD "1" "August 2017" "zcashd v1.0.11-rc1" "User Commands" .TH ZCASHD "1" "August 2017" "zcashd v1.0.11" "User Commands"
.SH NAME .SH NAME
zcashd \- manual page for zcashd v1.0.11-rc1 zcashd \- manual page for zcashd v1.0.11
.SH DESCRIPTION .SH DESCRIPTION
Zcash Daemon version v1.0.11\-rc1 Zcash Daemon version v1.0.11
.PP .PP
In order to ensure you are adequately protecting your privacy when using Zcash, In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>. please see <https://z.cash/support/security/index.html>.
@ -54,7 +54,7 @@ Specify data directory
\fB\-disabledeprecation=\fR<version> \fB\-disabledeprecation=\fR<version>
.IP .IP
Disable block\-height node deprecation and automatic shutdown (example: Disable block\-height node deprecation and automatic shutdown (example:
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11\-rc1) \fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11)
.HP .HP
\fB\-exportdir=\fR<dir> \fB\-exportdir=\fR<dir>
.IP .IP

View File

@ -0,0 +1,7 @@
Changelog
=========
Jack Grigg (2):
make-release.py: Versioning changes for 1.0.11.
make-release.py: Updated manpages for 1.0.11.

View File

@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 11 #define CLIENT_VERSION_REVISION 11
#define CLIENT_VERSION_BUILD 25 #define CLIENT_VERSION_BUILD 50
//! Set to true for release, false for prerelease or test build //! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true #define CLIENT_VERSION_IS_RELEASE true

View File

@ -6,7 +6,7 @@
#define ZCASH_DEPRECATION_H #define ZCASH_DEPRECATION_H
// Deprecation policy is 4th third-Tuesday after a release // Deprecation policy is 4th third-Tuesday after a release
static const int APPROX_RELEASE_HEIGHT = 159000; static const int APPROX_RELEASE_HEIGHT = 167200;
static const int WEEKS_UNTIL_DEPRECATION = 18; static const int WEEKS_UNTIL_DEPRECATION = 18;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);