From 6d6995bc83c3d97e5d99e45b40e76c34b772ebcc Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 20 Jun 2012 18:13:16 +0200
Subject: Update my GPG key

---
 contrib/gitian-downloader/sipa-key.pgp | Bin 108922 -> 109468 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'contrib')

diff --git a/contrib/gitian-downloader/sipa-key.pgp b/contrib/gitian-downloader/sipa-key.pgp
index a52a5deb1b..ffa09bb4ad 100644
Binary files a/contrib/gitian-downloader/sipa-key.pgp and b/contrib/gitian-downloader/sipa-key.pgp differ
-- 
cgit v1.2.3


From 3edb53eeed578fcccb13c4205c950f6938585240 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 20 Jun 2012 16:15:46 +0000
Subject: gitian-downloader: Update luke-jr's key

---
 contrib/gitian-downloader/luke-jr-key.pgp | Bin 5467 -> 7322 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'contrib')

diff --git a/contrib/gitian-downloader/luke-jr-key.pgp b/contrib/gitian-downloader/luke-jr-key.pgp
index c40917d78c..275b041d20 100644
Binary files a/contrib/gitian-downloader/luke-jr-key.pgp and b/contrib/gitian-downloader/luke-jr-key.pgp differ
-- 
cgit v1.2.3


From ccf2e853a1f4039d008e758138e80fa09e4f6f12 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 5 Jul 2012 23:05:58 +0000
Subject: Update Debian "Use system json-spirit" patch to apply

("Fixed" upstream in 3563824c602cb2b42cc21970935f45ce646c3964)
---
 .../patches/1001_use_system_json-spirit.patch      | 48 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

(limited to 'contrib')

diff --git a/contrib/debian/patches/1001_use_system_json-spirit.patch b/contrib/debian/patches/1001_use_system_json-spirit.patch
index 56a20af38c..307dfc8d49 100644
--- a/contrib/debian/patches/1001_use_system_json-spirit.patch
+++ b/contrib/debian/patches/1001_use_system_json-spirit.patch
@@ -1,10 +1,10 @@
 Description: Use system JSON Spirit library
 Author: Jonas Smedegaard <dr@jones.dk>
-Last-Update: 2011-05-17
---- a/src/rpc.cpp
-+++ b/src/rpc.cpp
-@@ -12,9 +12,7 @@
- #include <boost/asio/ssl.hpp> 
+Last-Update: 2012-07-05
+--- a/src/bitcoinrpc.cpp
++++ b/src/bitcoinrpc.cpp
+@@ -20,9 +20,7 @@
+ #include <boost/filesystem/fstream.hpp>
  typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
  #endif
 -#include "json/json_spirit_reader_template.h"
@@ -16,11 +16,41 @@ Last-Update: 2011-05-17
  // precompiled in headers.h.  The problem might be when the pch file goes over
 --- a/src/makefile.unix
 +++ b/src/makefile.unix
-@@ -23,6 +23,7 @@
-    -l boost_thread \
-    -l db_cxx \
+@@ -29,6 +29,7 @@ LIBS += \
+    -l boost_thread$(BOOST_LIB_SUFFIX) \
+    -l db_cxx$(BDB_LIB_SUFFIX) \
     -l ssl \
 +   -l json_spirit \
     -l crypto
  
- ifdef USE_UPNP
+ ifndef USE_UPNP
+--- a/src/rpcdump.cpp
++++ b/src/rpcdump.cpp
+@@ -15,9 +15,8 @@
+ // typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
+ // #endif
+ // #include <boost/xpressive/xpressive_dynamic.hpp>
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_writer_template.h"
+-#include "json/json_spirit_utils.h"
++
++#include <json_spirit.h>
+ 
+ #define printf OutputDebugStringF
+ 
+--- a/src/test/rpc_tests.cpp
++++ b/src/test/rpc_tests.cpp
+@@ -1,11 +1,10 @@
+ #include <boost/test/unit_test.hpp>
+ #include <boost/foreach.hpp>
+ 
++#include <json_spirit.h>
++
+ #include "base58.h"
+ #include "util.h"
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_writer_template.h"
+-#include "json/json_spirit_utils.h"
+ 
+ using namespace std;
+ using namespace json_spirit;
-- 
cgit v1.2.3


From a0cbcfd6ed9607e481211826c33cdd15e2cee579 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 5 Jul 2012 23:05:58 +0000
Subject: Update Debian "Use system json-spirit" patch to apply

("Fixed" upstream in 3563824c602cb2b42cc21970935f45ce646c3964)
---
 contrib/debian/patches/1001_use_system_json-spirit.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'contrib')

diff --git a/contrib/debian/patches/1001_use_system_json-spirit.patch b/contrib/debian/patches/1001_use_system_json-spirit.patch
index 56a20af38c..d471bded8f 100644
--- a/contrib/debian/patches/1001_use_system_json-spirit.patch
+++ b/contrib/debian/patches/1001_use_system_json-spirit.patch
@@ -1,8 +1,8 @@
 Description: Use system JSON Spirit library
 Author: Jonas Smedegaard <dr@jones.dk>
-Last-Update: 2011-05-17
---- a/src/rpc.cpp
-+++ b/src/rpc.cpp
+Last-Update: 2012-07-05
+--- a/src/bitcoinrpc.cpp
++++ b/src/bitcoinrpc.cpp
 @@ -12,9 +12,7 @@
  #include <boost/asio/ssl.hpp> 
  typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
-- 
cgit v1.2.3