From 2c31cfc27128d470104a7ed221ea584b87cbcdd6 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 27 Apr 2012 10:14:33 -0400 Subject: [PATCH] Bump version numbers for 0.6.1rc1 --- bitcoin-qt.pro | 2 +- doc/README | 2 +- doc/README_windows.txt | 2 +- doc/release-process.txt | 2 +- share/setup.nsi | 6 +++--- src/obj/nogui/.gitignore | 2 -- src/obj/test/.gitignore | 2 -- src/version.h | 4 ++-- 8 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 src/obj/nogui/.gitignore delete mode 100644 src/obj/test/.gitignore diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 5d359c054a..a157f41e97 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = -VERSION = 0.6.0 +VERSION = 0.6.1 INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI BOOST_THREAD_USE_LIB CONFIG += no_include_pwd diff --git a/doc/README b/doc/README index 00694e2ae1..aa89960959 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -Bitcoin 0.6.0 BETA +Bitcoin 0.6.1rc1 BETA Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying diff --git a/doc/README_windows.txt b/doc/README_windows.txt index 9aa5aa744f..6b48b1d1e5 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.6.0 BETA +Bitcoin 0.6.1rc1 BETA Copyright (c) 2009-2012 Bitcoin Developers Distributed under the MIT/X11 software license, see the accompanying diff --git a/doc/release-process.txt b/doc/release-process.txt index 3f3c6dad6a..a1b0250acf 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -2,7 +2,7 @@ * update (commit) version in sources bitcoin-qt.pro - src/version.cpp + src/version.h share/setup.nsi doc/README* diff --git a/share/setup.nsi b/share/setup.nsi index 4dc2ad5f05..fa33bd9786 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 0.6.0 +!define VERSION 0.6.1 !define COMPANY "Bitcoin project" !define URL http://www.bitcoin.org/ @@ -45,13 +45,13 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile bitcoin-0.6.0-win32-setup.exe +OutFile bitcoin-0.6.1rc1-win32-setup.exe InstallDir $PROGRAMFILES\Bitcoin CRCCheck on XPStyle on BrandingText " " ShowInstDetails show -VIProductVersion 0.6.0.99 +VIProductVersion 0.6.1.1 VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff --git a/src/obj/nogui/.gitignore b/src/obj/nogui/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/obj/nogui/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/obj/test/.gitignore b/src/obj/test/.gitignore deleted file mode 100644 index d6b7ef32c8..0000000000 --- a/src/obj/test/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/version.h b/src/version.h index f63b1bdadd..e8d5b5c421 100644 --- a/src/version.h +++ b/src/version.h @@ -12,8 +12,8 @@ static const int CLIENT_VERSION_MAJOR = 0; static const int CLIENT_VERSION_MINOR = 6; -static const int CLIENT_VERSION_REVISION = 0; -static const int CLIENT_VERSION_BUILD = 99; +static const int CLIENT_VERSION_REVISION = 1; +static const int CLIENT_VERSION_BUILD = 1; static const int CLIENT_VERSION = 1000000 * CLIENT_VERSION_MAJOR