git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a1c3d8f ef9ab3c)
Merge branch '0.5.x' into 0.6.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:32:09 +0000 (10:32 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:32:09 +0000 (10:32 -0400)
Conflicts:
bitcoin-qt.pro
contrib/debian/changelog
doc/README
doc/README_windows.txt
doc/translation_process.md
share/setup.nsi
src/bitcoinrpc.cpp
src/db.cpp
src/init.cpp
src/irc.cpp
src/main.cpp
src/main.h
src/makefile.osx
src/makefile.unix
src/net.cpp
src/net.h
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/bitcoinstrings.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
src/qt/sendcoinsdialog.h
src/qt/transactionrecord.cpp
src/script.cpp
src/script.h
src/serialize.h
src/util.cpp
src/util.h

1  2 
contrib/gitian-descriptors/gitian-win32.yml patch | diff1 | diff2 | blob | history
contrib/gitian-descriptors/gitian.yml patch | diff1 | diff2 | blob | history

diff --combined contrib/gitian-descriptors/gitian-win32.yml
index 9e372c7,0f46709..4f299c4
--- 1/contrib/gitian-descriptors/gitian-win32.yml
--- 2/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@@ -10,14 -10,17 +10,14 @@@ packages
  - "unzip"
  - "nsis"
  - "faketime"
 -- "wine"
  reference_datetime: "2011-01-30 00:00:00"
  remotes:
- - "url": "https://github.com/bitcoin/bitcoin.git"
+ - "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git"
    "dir": "bitcoin"
  files:
  - "qt-win32-4.7.4-gitian.zip"
  - "boost-win32-1.47.0-gitian.zip"
 -- "openssl-1.0.0e.tar.gz"
 -- "db-4.8.30.NC.tar.gz"
 -- "miniupnpc-1.6.tar.gz"
 +- "bitcoin-deps-0.0.3.zip"
  script: |
    #
    mkdir $HOME/qt
@@@ -39,9 -42,25 +39,9 @@@
    mv include/boost .
    cd ..
    #
 -  tar xzf openssl-1.0.0e.tar.gz
 -  cd openssl-1.0.0e
 -  ./Configure --cross-compile-prefix=i586-mingw32msvc- mingw
 -  make
 -  cd ..
 +  unzip bitcoin-deps-0.0.3.zip
    #
 -  tar xzf db-4.8.30.NC.tar.gz
 -  cd db-4.8.30.NC/build_unix
 -  ../dist/configure --enable-mingw --enable-cxx --host=i586-mingw32msvc CFLAGS="-I/usr/i586-mingw32msvc/include"
 -  make $MAKEOPTS
 -  cd ../..
 -  #
 -  tar xzf miniupnpc-1.6.tar.gz
 -  cd miniupnpc-1.6
 -  sed 's/dllwrap -k --driver-name gcc/$(DLLWRAP) -k --driver-name $(CC)/' -i Makefile.mingw
 -  sed 's|wingenminiupnpcstrings $< $@|./wingenminiupnpcstrings $< $@|' -i Makefile.mingw
 -  make -f Makefile.mingw DLLWRAP=i586-mingw32msvc-dllwrap CC=i586-mingw32msvc-gcc AR=i586-mingw32msvc-ar
 -  cd ..
 -  mv miniupnpc-1.6 miniupnpc
 +  find -type f | xargs touch --date="$REFERENCE_DATETIME"
    #
    cd bitcoin
    mkdir -p $OUTDIR/src
@@@ -52,7 -71,7 +52,7 @@@
    export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
    export FAKETIME=$REFERENCE_DATETIME
    export TZ=UTC
 -  $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross USE_SSL=1 MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
 +  $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross USE_SSL=1 MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_47_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_47_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.0e OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.0e/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin QMAKE_LFLAGS=-frandom-seed=bitcoin
    make $MAKEOPTS
    cp release/bitcoin-qt.exe $OUTDIR/
    #
diff --combined contrib/gitian-descriptors/gitian.yml
index 086e097,11ee4dc..52056b3
--- 1/contrib/gitian-descriptors/gitian.yml
--- 2/contrib/gitian-descriptors/gitian.yml
+++ b/contrib/gitian-descriptors/gitian.yml
@@@ -16,15 -16,12 +16,15 @@@ packages
  - "libssl-dev"
  - "git-core"
  - "unzip"
 +- "pkg-config"
 +- "libpng12-dev"
  reference_datetime: "2011-01-30 00:00:00"
  remotes:
- - "url": "https://github.com/bitcoin/bitcoin.git"
+ - "url": "https://git.gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable.git"
    "dir": "bitcoin"
  files:
  - "miniupnpc-1.6.tar.gz"
 +- "qrencode-3.2.0.tar.bz2"
  script: |
    INSTDIR="$HOME/install"
    export LIBRARY_PATH="$INSTDIR/lib"
@@@ -34,12 -31,6 +34,12 @@@
    INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
    cd ..
    #
 +  tar xjf qrencode-3.2.0.tar.bz2
 +  cd qrencode-3.2.0
 +  ./configure --prefix=$INSTDIR --enable-static --disable-shared
 +  make $MAKEOPTS install
 +  cd ..
 +  #
    cd bitcoin
    mkdir -p $OUTDIR/src
    cp -a . $OUTDIR/src
@@@ -52,6 -43,6 +52,6 @@@
    mkdir -p $OUTDIR/bin/$GBUILD_BITS
    install -s bitcoind $OUTDIR/bin/$GBUILD_BITS
    cd ..
 -  qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_SSL=1
 +  qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_SSL=1 USE_QRCODE=1
    make $MAKEOPTS
    install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS
Novacoin client