aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bitcoin-qt.pro2
-rwxr-xr-xcontrib/verifysfbinaries/verify.sh2
-rw-r--r--doc/README.md2
-rw-r--r--doc/README_windows.txt2
-rw-r--r--doc/release-notes.md3
-rw-r--r--share/setup.nsi6
-rw-r--r--src/clientversion.h2
7 files changed, 10 insertions, 9 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index c1e4b0b882..996b53cd11 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = bitcoin-qt
macx:TARGET = "Bitcoin-Qt"
-VERSION = 0.8.4
+VERSION = 0.8.5
INCLUDEPATH += src src/json src/qt
QT += network
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifysfbinaries/verify.sh
index 68febf647d..d0c975bddd 100755
--- a/contrib/verifysfbinaries/verify.sh
+++ b/contrib/verifysfbinaries/verify.sh
@@ -18,7 +18,7 @@ WORKINGDIR="/tmp/bitcoin"
TMPFILE="hashes.tmp"
#this URL is used if a version number is not specified as an argument to the script
-SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.4/SHA256SUMS.asc"
+SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.5/SHA256SUMS.asc"
SIGNATUREFILENAME="SHA256SUMS.asc"
RCSUBDIR="test/"
diff --git a/doc/README.md b/doc/README.md
index f63296759e..1a7b068687 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,4 +1,4 @@
-Bitcoin 0.8.4 BETA
+Bitcoin 0.8.5 BETA
====================
Copyright (c) 2009-2013 Bitcoin Developers
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index 46f6c1aed8..f0eb211504 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.8.4 BETA
+Bitcoin 0.8.5 BETA
Copyright (c) 2009-2013 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 33fc351860..bc605cf8bd 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,6 +1,7 @@
(note: this is a temporary file, to be added-to by anybody, and deleted at
release time)
-0.8.4 changes
+0.8.5 changes
=============
+Workaround negative version numbers serialization bug.
diff --git a/share/setup.nsi b/share/setup.nsi
index a4ad129939..8005bf73b8 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.8.4
+!define VERSION 0.8.5
!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.8.4-win32-setup.exe
+OutFile bitcoin-0.8.5-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.8.4.0
+VIProductVersion 0.8.5.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/clientversion.h b/src/clientversion.h
index 07cac5cd6b..5381983f4e 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 8
-#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build