Browse Source

Update contrib/debian and remove system json_spirit patch.

That patch has been broken for a long, long time (forever?) and
doesn't make sense.
pull/1/head
Matt Corallo 10 years ago
parent
commit
3563824c60
  1. 6
      contrib/debian/changelog
  2. 26
      contrib/debian/patches/1001_use_system_json-spirit.patch
  3. 2
      contrib/debian/patches/series

6
contrib/debian/changelog vendored

@ -1,3 +1,9 @@ @@ -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
* Update package description and launch scripts.

26
contrib/debian/patches/1001_use_system_json-spirit.patch vendored

@ -1,26 +0,0 @@ @@ -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

2
contrib/debian/patches/series vendored

@ -1 +1 @@ @@ -1 +1 @@
#1001_use_system_json-spirit.patch

Loading…
Cancel
Save