From 03aad9ca8bebd5b1143c28bb30322691a9ebf1c1 Mon Sep 17 00:00:00 2001 From: MarcelusCH Date: Sun, 24 Jul 2022 10:26:10 +0200 Subject: [PATCH] versioning as pre-release update --- README.md | 2 +- configure.ac | 6 +++--- contrib/debian/changelog | 6 ++++++ contrib/gitian-descriptors/gitian-linux.yml | 2 +- doc/man/bitcoinz-cli.1 | 6 +++--- doc/man/bitcoinz-tx.1 | 6 +++--- doc/man/bitcoinzd.1 | 6 +++--- doc/release-notes/release-notes-2.0.8-RC1.md | 2 ++ src/clientversion.cpp | 2 +- src/clientversion.h | 6 +++--- src/metrics.cpp | 2 +- 11 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 doc/release-notes/release-notes-2.0.8-RC1.md diff --git a/README.md b/README.md index b3c1eb995..fadd9f560 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# BitcoinZ 2.0.7-10 +# BitcoinZ 2.0.8-RC1 **Keep running wallet to strengthen the BitcoinZ network. Backup your wallet in many locations & keep your coins wallet offline.** ### Ports: diff --git a/configure.ac b/configure.ac index 100475a3d..051e4392f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 7) -define(_CLIENT_VERSION_BUILD, 60) +define(_CLIENT_VERSION_REVISION, 8) +define(_CLIENT_VERSION_BUILD, 25) 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) +define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2022) AC_INIT([BitcoinZ],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/btcz/bitcoinz/issues],[BitcoinZ]) AC_CONFIG_SRCDIR([src/main.cpp]) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index fc7eb8c58..ce42db468 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +bitcoinz (2.0.8-RC1) stable; urgency=low + + * 2.0.8-RC1 release. + + -- The BitcoinZ Community Jul 2022 + bitcoinz (2.0.7-10) stable; urgency=medium * 2.0.7-10 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 49a4c8d41..57182fd38 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoinz-2.0.7-10" +name: "bitcoinz-2.0.8-RC1" enable_cache: true distro: "debian" suites: diff --git a/doc/man/bitcoinz-cli.1 b/doc/man/bitcoinz-cli.1 index 28516c5e4..c2ee1ec64 100644 --- a/doc/man/bitcoinz-cli.1 +++ b/doc/man/bitcoinz-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOINZ-CLI "1" "May 2022" "bitcoinz-cli v2.0.7-10" "User Commands" +.TH BITCOINZ-CLI "1" "Jul 2022" "bitcoinz-cli v2.0.8-RC1" "User Commands" .SH NAME -bitcoinz-cli \- manual page for bitcoinz-cli v2.0.7-10 +bitcoinz-cli \- manual page for bitcoinz-cli v2.0.8-RC1 .SH DESCRIPTION -BitcoinZ RPC client version v2.0.7-10 +BitcoinZ RPC client version v2.0.8-RC1 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . diff --git a/doc/man/bitcoinz-tx.1 b/doc/man/bitcoinz-tx.1 index 1fc0b4931..6904cf2d0 100644 --- a/doc/man/bitcoinz-tx.1 +++ b/doc/man/bitcoinz-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOINZ-TX "1" "May 2022" "bitcoinz-tx v2.0.7-10" "User Commands" +.TH BITCOINZ-TX "1" "Jul 2022" "bitcoinz-tx v2.0.8-RC1" "User Commands" .SH NAME -bitcoinz-tx \- manual page for bitcoinz-tx v2.0.7-10 +bitcoinz-tx \- manual page for bitcoinz-tx v2.0.8-RC1 .SH DESCRIPTION -BitcoinZ bitcoinz\-tx utility version v2.0.7-10 +BitcoinZ bitcoinz\-tx utility version v2.0.8-RC1 .SS "Usage:" .TP bitcoinz\-tx [options] [commands] diff --git a/doc/man/bitcoinzd.1 b/doc/man/bitcoinzd.1 index 31b8dfc89..2591f4cb6 100644 --- a/doc/man/bitcoinzd.1 +++ b/doc/man/bitcoinzd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH BITCOINZD "1" "May 2022" "bitcoinzd v2.0.7-10" "User Commands" +.TH BITCOINZD "1" "Jul 2022" "bitcoinzd v2.0.8-RC1" "User Commands" .SH NAME -bitcoinzd \- manual page for bitcoinzd v2.0.7-10 +bitcoinzd \- manual page for bitcoinzd v2.0.8-RC1 .SH DESCRIPTION -BitcoinZ Daemon version v2.0.7-10 +BitcoinZ Daemon version v2.0.8-RC1 .PP In order to ensure you are adequately protecting your privacy when using BitcoinZ, please see . diff --git a/doc/release-notes/release-notes-2.0.8-RC1.md b/doc/release-notes/release-notes-2.0.8-RC1.md new file mode 100644 index 000000000..4c7be84fe --- /dev/null +++ b/doc/release-notes/release-notes-2.0.8-RC1.md @@ -0,0 +1,2 @@ +Notable changes +=============== diff --git a/src/clientversion.cpp b/src/clientversion.cpp index f71685979..2a300ce81 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -24,7 +24,7 @@ const std::string CLIENT_NAME("YODA"); /** * Client version number */ -#define CLIENT_VERSION_SUFFIX "" +#define CLIENT_VERSION_SUFFIX "1" /** diff --git a/src/clientversion.h b/src/clientversion.h index 864bf1b53..837213a73 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,11 +18,11 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 7 -#define CLIENT_VERSION_BUILD 60 +#define CLIENT_VERSION_REVISION 8 +#define CLIENT_VERSION_BUILD 25 //! Set to true for release, false for prerelease or test build -#define CLIENT_VERSION_IS_RELEASE true +#define CLIENT_VERSION_IS_RELEASE false /** * Copyright year (2009-this) diff --git a/src/metrics.cpp b/src/metrics.cpp index ea8bfa6ce..e81b618b1 100644 --- a/src/metrics.cpp +++ b/src/metrics.cpp @@ -461,7 +461,7 @@ void ThreadShowMetricsScreen() std::cout << std::endl; // Thank you text - std::cout << _("BTCZ Node Version 2.0.7-10 (YODA) - Protocol 770008") << std::endl; + std::cout << _("BTCZ Node Version 2.0.8-RC1 (YODA) - Protocol 770008") << std::endl; std::cout << _("Thank you for running a BitcoinZ node!") << std::endl; std::cout << _("You're helping to strengthen the network and contributing to a social good :)") << std::endl; }