aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-06-03 15:22:20 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-06-03 15:22:33 +0200
commit9d67b100916e9f407b4de6648ad93b8535a270b3 (patch)
treeb7b947fdc7b9b7dd183b6cb2a89436e3a048b0ae
parentc7272a50bdc773a901f7c8ca5e5fddd1a5bdcca1 (diff)
parent960e99404ff7337a5eefac9086dd2843fd70f24a (diff)
downloadbitcoin-9d67b100916e9f407b4de6648ad93b8535a270b3.tar.xz
Merge pull request #6218
960e994 gitian: Bump cache dir for current master (Cory Fields) be65628 gitian: bump faketime to something more recent (Cory Fields) c3cdd7b osx: set min version to 10.7 for 0.11+ (Cory Fields)
-rw-r--r--contrib/gitian-descriptors/gitian-linux.yml4
-rw-r--r--contrib/gitian-descriptors/gitian-osx-signer.yml2
-rw-r--r--contrib/gitian-descriptors/gitian-osx.yml4
-rw-r--r--contrib/gitian-descriptors/gitian-win.yml4
-rw-r--r--share/qt/Info.plist.in2
5 files changed, 8 insertions, 8 deletions
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index dde4af3491..440d95a355 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
---
-name: "bitcoin-linux-0.10"
+name: "bitcoin-linux-0.12"
enable_cache: true
suites:
- "precise"
@@ -16,7 +16,7 @@ packages:
- "bsdmainutils"
- "binutils-gold"
- "libstdc++6-4.6-pic"
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2015-06-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
index afe03c7a22..c0c0b0c98b 100644
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -7,7 +7,7 @@ architectures:
packages:
- "libc6:i386"
- "faketime"
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2015-06-01 00:00:00"
remotes: []
files:
- "bitcoin-osx-unsigned.tar.gz"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 61eb5b1001..bad9a0e768 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,5 +1,5 @@
---
-name: "bitcoin-osx-0.10"
+name: "bitcoin-osx-0.12"
enable_cache: true
suites:
- "precise"
@@ -18,7 +18,7 @@ packages:
- "libcap-dev"
- "libz-dev"
- "libbz2-dev"
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2015-06-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 2d72f7b6e5..20cfb29859 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
---
-name: "bitcoin-win-0.10"
+name: "bitcoin-win-0.12"
enable_cache: true
suites:
- "precise"
@@ -18,7 +18,7 @@ packages:
- "g++-mingw-w64"
- "nsis"
- "zip"
-reference_datetime: "2013-06-01 00:00:00"
+reference_datetime: "2015-06-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index d5a7144be0..a389332a52 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -3,7 +3,7 @@
<plist version="0.9">
<dict>
<key>LSMinimumSystemVersion</key>
- <string>10.6.0</string>
+ <string>10.7.0</string>
<key>LSArchitecturePriority</key>
<array>