Merge pull request #1520 from TheBlueMatt/debian
Update contrib/debian and remove system json_spirit patch.
This commit is contained in:
commit
8a6ea5d687
@ -1,3 +1,9 @@
|
|||||||
|
bitcoin (0.6.3-natty1) natty; urgency=low
|
||||||
|
|
||||||
|
* New upstream release.
|
||||||
|
|
||||||
|
-- Matt Corallo <matt@bluematt.me> Mon, 25 Jun 2012 23:47:00 +0200
|
||||||
|
|
||||||
bitcoin (0.6.2-natty1) natty; urgency=low
|
bitcoin (0.6.2-natty1) natty; urgency=low
|
||||||
|
|
||||||
* Update package description and launch scripts.
|
* Update package description and launch scripts.
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
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>
|
|
||||||
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
|
|
||||||
#endif
|
|
||||||
-#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
|
|
||||||
// MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are
|
|
||||||
// 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 \
|
|
||||||
-l ssl \
|
|
||||||
+ -l json_spirit \
|
|
||||||
-l crypto
|
|
||||||
|
|
||||||
ifdef USE_UPNP
|
|
@ -1 +1 @@
|
|||||||
#1001_use_system_json-spirit.patch
|
|
||||||
|
Loading…
Reference in New Issue
Block a user