Merge branch 'master' of https://github.com/bitcoin/bitcoin

Conflicts:
	.gitignore (used upstream version)
	bitcoin-qt.pro

5 files changed, 91 insertions, 1 deletions

diff --git a/contrib/Bitcoin.app/Contents/Info.plist b/contrib/Bitcoin.app/Contents/Info.plist
index a5c7da1c8f..d5a278a570 100644
--- a/contrib/Bitcoin.app/Contents/Info.plist
+++ b/contrib/Bitcoin.app/Contents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.00</string>
+	<string>0.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/contrib/BitcoinTemplate.dmg b/contrib/BitcoinTemplate.dmg
new file mode 100644
index 0000000000..ca86308e05
--- /dev/null
+++ b/contrib/BitcoinTemplate.dmg
diff --git a/contrib/create_osx_dmg.sh b/contrib/create_osx_dmg.sh
new file mode 100755
index 0000000000..af164e56cf
--- /dev/null
+++ b/contrib/create_osx_dmg.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# 
+# Creates a Bitcoin.dmg OSX file from the contrib/BitcoinTemplate.dmg file
+#
+# Recipe from: http://digital-sushi.org/entry/how-to-create-a-disk-image-installer-for-apple-mac-os-x/
+#
+# To make a prettier BitcoinTemplate.dmg:
+#  + open (mount) BitcoinTemplate.dmg
+#  + change the file properties, icon positions, background image, etc
+#  + eject, then commit the changed BitcoinTemplate.dmg
+#
+
+CWD=$(pwd)
+
+if [ $# -lt 1 ]; then
+    if [ $(basename $CWD) == "contrib" ]
+    then
+        TOP=$(dirname $CWD)
+    else
+        echo "Usage: $0 /path/to/bitcoin/tree"
+        exit 1
+    fi
+else
+    TOP=$1
+fi
+
+CONTRIB=$TOP/contrib
+BUILD_DIR=/tmp/bitcoin_osx_build
+
+# First, compile bitcoin and bitcoind
+cd "$TOP/src"
+if [ ! -e bitcoin ]; then make -f makefile.osx bitcoin; fi
+if [ ! -e bitcoind ]; then make -f makefile.osx bitcoind; fi
+strip bitcoin bitcoind
+
+mkdir -p "$BUILD_DIR"
+cd "$BUILD_DIR"
+
+rm -f Bitcoin.sparseimage
+hdiutil convert "$CONTRIB/BitcoinTemplate.dmg" -format UDSP -o Bitcoin
+hdiutil mount Bitcoin.sparseimage
+
+# Copy over placeholders in /Volumes/Bitcoin
+cp "$TOP/src/bitcoind" /Volumes/Bitcoin/
+cp "$TOP/src/bitcoin" /Volumes/Bitcoin/Bitcoin.app/Contents/MacOS/
+
+# Create source code .zip
+cd "$TOP"
+git archive -o /Volumes/Bitcoin/bitcoin.zip $(git branch 2>/dev/null|grep -e ^* | cut -d ' ' -f 2)
+
+# Fix permissions
+chmod -Rf go-w /Volumes/Bitcoin
+
+cd "$BUILD_DIR"
+hdiutil eject /Volumes/Bitcoin
+rm -f "$CWD/Bitcoin.dmg"
+hdiutil convert Bitcoin.sparseimage -format UDBZ -o "$CWD/Bitcoin.dmg"
+
+cd "$CWD"
+rm -rf "$BUILD_DIR"
diff --git a/contrib/gitian-downloader/bitcoin-download-config b/contrib/gitian-downloader/linux-download-config
index d21bb07808..d21bb07808 100644
--- a/contrib/gitian-downloader/bitcoin-download-config
+++ b/contrib/gitian-downloader/linux-download-config
diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config
new file mode 100644
index 0000000000..c0de21c48f
--- /dev/null
+++ b/contrib/gitian-downloader/win32-download-config
@@ -0,0 +1,30 @@
+--- 
+name: bitcoin
+urls:
+- http://bitcoin.org/bitcoin-latest-win32-gitian.zip
+rss:
+- url: http://sourceforge.net/api/file/index/project-id/244765/mtime/desc/limit/100/rss
+  xpath: //item/link/text()
+  pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip
+signers:
+  0A82509767C7D4A5D14DA2301AE1D35043E08E54:
+    weight: 40
+    name: BlueMatt
+    key: bluematt
+  BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
+    weight: 40
+    name: Devrandom
+    key: devrandom
+  D762373D24904A3E42F33B08B9A408E71DAAC974:
+    weight: 40
+    name: Sipa
+    key: sipa
+  77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
+    weight: 40
+    name: tcatm
+    key: tcatm
+  01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
+    weight: 40
+    name: "Gavin Andresen"
+    key: gavinandresen
+minimum_weight: 120