sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 21:42:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'rc4' into rc5

Browse Source
This commit is contained in:
Evan Duffield 2014-08-25 10:40:11 -07:00
commit c5af2cf3ac
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitcoin-qt.pro
View File

@ -1,3 +1,6 @@
# Hack around https://bugreports.qt-project.org/browse/QTBUG-22829
QMAKE_MOC = $$QMAKE_MOC -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
TEMPLATE = app
TARGET = darkcoin-qt
macx:TARGET = "DarkCoin-Qt"

2
contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml
View File

@ -23,7 +23,7 @@ packages:
- "libqt4-test"
reference_datetime: "2014-01-10 00:00:00"
remotes:
- "url": "https://github.com/darkcoinproject/darkcoin.git"
- "url": "https://github.com/schinzelh/darkcoin-rc.git"
"dir": "darkcoin"
files:
- "bitcoin-deps-linux32-gitian-r6.zip"

4
contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml
View File

@ -14,7 +14,7 @@ packages:
reference_datetime: "2014-01-10 00:00:00"
remotes:
- "url": "https://github.com/darkcoinproject/darkcoin.git"
- "url": "https://github.com/schinzelh/darkcoin-rc.git"
"dir": "darkcoin"
files:
- "osx-native-depends-r3.tar.gz"
@ -80,4 +80,4 @@ script: |
/usr/bin/install -c contrib/macdeploy/DS_Store dist/.DS_Store
cd dist; ln -s /Applications Applications; cd ..
genisoimage -no-cache-inodes -l -probe -V "DarkCoin-Qt" -no-pad -r -apple -o DarkCoin-Qt.dmg dist
dmg dmg DarkCoin-Qt.dmg /home/ubuntu/out/DarkCoin-Qt.dmg
dmg dmg DarkCoin-Qt.dmg /home/ubuntu/out/DarkCoin-Qt.dmg

4
contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml
View File

@ -13,7 +13,7 @@ packages:
- "faketime"
reference_datetime: "2014-01-10 00:00:00"
remotes:
- "url": "https://github.com/darkcoinproject/darkcoin.git"
- "url": "https://github.com/schinzelh/darkcoin-rc.git"
"dir": "darkcoin"
files:
- "qt-win32-4.8.5-gitian-r5.zip"
@ -112,4 +112,4 @@ script: |
rm -rf $TEMPDIR
mkdir -p $TEMPDIR
cd $TEMPDIR
tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
tar -xvf $HOME/build/darkcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME

2
src/clientversion.h
View File

@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 10
#define CLIENT_VERSION_REVISION 12
#define CLIENT_VERSION_BUILD 31
#define CLIENT_VERSION_BUILD 32
// Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true