Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into translations

  • Loading branch information...
2 parents a28d080 + eeac872 commit bcceb8b94797366e44125354f36a8bc3927cd8ff @TheBlueMatt committed Jun 18, 2011
Showing with 7,393 additions and 3,452 deletions.
  1. +2 −0 .gitignore
  2. +1 −1 doc/README
  3. +1 −1 doc/README_windows.txt
  4. +3 −8 doc/build-msw.txt
  5. +36 −0 doc/release-process.txt
  6. BIN locale/cs/LC_MESSAGES/bitcoin.mo
  7. +975 −0 locale/cs/LC_MESSAGES/bitcoin.po
  8. BIN locale/de/LC_MESSAGES/bitcoin.mo
  9. +403 −451 locale/de/LC_MESSAGES/bitcoin.po
  10. BIN locale/eo/LC_MESSAGES/bitcoin.mo
  11. +977 −0 locale/eo/LC_MESSAGES/bitcoin.po
  12. BIN locale/es/LC_MESSAGES/bitcoin.mo
  13. +419 −466 locale/es/LC_MESSAGES/bitcoin.po
  14. BIN locale/fr/LC_MESSAGES/bitcoin.mo
  15. +377 −369 locale/fr/LC_MESSAGES/bitcoin.po
  16. BIN locale/it/LC_MESSAGES/bitcoin.mo
  17. +411 −454 locale/it/LC_MESSAGES/bitcoin.po
  18. BIN locale/lt/LC_MESSAGES/bitcoin.mo
  19. +377 −428 locale/lt/LC_MESSAGES/bitcoin.po
  20. BIN locale/nl/LC_MESSAGES/bitcoin.mo
  21. +383 −420 locale/nl/LC_MESSAGES/bitcoin.po
  22. BIN locale/pt/LC_MESSAGES/bitcoin.mo
  23. +376 −369 locale/pt/LC_MESSAGES/bitcoin.po
  24. BIN locale/ru/LC_MESSAGES/bitcoin.mo
  25. +393 −386 locale/ru/LC_MESSAGES/bitcoin.po
  26. +983 −0 locale/sv/LC_MESSAGES/bitcoin.po
  27. BIN locale/zh_cn/LC_MESSAGES/bitcoin.mo
  28. +973 −0 locale/zh_cn/LC_MESSAGES/bitcoin.po
  29. +10 −12 share/setup.nsi
  30. +2 −0 src/base58.h
  31. +3 −0 src/bignum.h
  32. +8 −6 src/db.cpp
  33. +1 −29 src/headers.h
  34. +16 −2 src/init.cpp
  35. +3 −0 src/irc.cpp
  36. +21 −8 src/main.cpp
  37. +20 −8 src/main.h
  38. +5 −4 src/makefile.mingw
  39. +1 −1 src/makefile.osx
  40. +94 −7 src/net.cpp
  41. +22 −5 src/net.h
  42. +23 −4 src/rpc.cpp
  43. +1 −1 src/serialize.h
  44. +58 −7 src/ui.cpp
  45. +13 −4 src/util.cpp
  46. +2 −1 src/util.h
View
@@ -1,3 +1,5 @@
src/*.exe
src/bitcoin
src/bitcoind
+.*.swp
+*.*~*
View
@@ -1,4 +1,4 @@
-Bitcoin 0.3.22 BETA
+Bitcoin 0.3.23 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
@@ -1,4 +1,4 @@
-Bitcoin 0.3.22 BETA
+Bitcoin 0.3.23 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
View
@@ -28,7 +28,7 @@ Libraries you need to download separately and build:
default path download
wxWidgets \wxwidgets-2.9.1-mgw http://www.wxwidgets.org/downloads/
-OpenSSL \openssl-1.0.0c-mgw http://www.openssl.org/source/
+OpenSSL \openssl-1.0.0d-mgw http://www.openssl.org/source/
Berkeley DB \db-4.7.25.NC-mgw http://www.oracle.com/technology/software/products/berkeley-db/index.html
Boost \boost-1.43.0-mgw http://www.boost.org/users/download/
miniupnpc \upnpc-exe-win32-20110215 http://miniupnp.tuxfamily.org/files/
@@ -42,7 +42,7 @@ miniupnpc New (3-clause) BSD license
Versions used in this release:
wxWidgets 2.9.1
-OpenSSL 1.0.0c
+OpenSSL 1.0.0d
Berkeley DB 4.7.25.NC
Boost 1.43.0
miniupnpc 1.5-20110215
@@ -66,15 +66,10 @@ MSYS shell:
un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
-cd /c/openssl-1.0.0c-mgw
+cd /c/openssl-1.0.0d-mgw
./config
make
-perl util/mkdef.pl 32 libeay enable-static-engine > libeay32.def
-dllwrap --dllname libeay32.dll --output-lib libeay32.a --def libeay32.def libcrypto.a -lws2_32 -lgdi32
-
-after that openssl libeay is in main source dir (openssl-1.0.0c-mgw)
-
Berkeley DB
-----------
MSYS shell:
@@ -0,0 +1,36 @@
+
+* tag version in git
+
+ $ git tag -a v0.3.23
+
+* write release notes. git shortlog helps a lot:
+
+ $ git shortlog --no-merges v0.3.22..
+
+* create source-only archive
+
+ $ git archive --format=tar --prefix=bitcoin-0.3.23/ HEAD | \
+ gzip -9c > ~/tmp/bitcoin-0.3.23-src.tar.gz
+
+* perform gitian builds
+
+ { insert useful info here }
+
+ Build output expected:
+ 1. linux 32-bit and 64-bit binaries + source
+ 2. windows 32-bit binary + source
+ 3. windows installer
+
+* upload source and builds to SF
+
+* create SHA1SUMS for builds, and PGP-sign it
+
+* update bitcoin.org version
+
+* update forum version
+
+* update wiki
+
+* update wiki download links
+
+
Binary file not shown.
Oops, something went wrong.

0 comments on commit bcceb8b

Please sign in to comment.