aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2012-06-25 23:59:19 +0200
committerMatt Corallo <matt@bluematt.me>2012-06-25 23:59:19 +0200
commit3563824c602cb2b42cc21970935f45ce646c3964 (patch)
treec4ddb30b4334ec15d35b1866f09d4db661c21742 /contrib
parent2849d0661d0c9154924099aafb986552f562d8f7 (diff)
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.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/changelog6
-rw-r--r--contrib/debian/patches/1001_use_system_json-spirit.patch26
-rw-r--r--contrib/debian/patches/series2
3 files changed, 7 insertions, 27 deletions
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 773da6b54f..52d0e5907b 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -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.
diff --git a/contrib/debian/patches/1001_use_system_json-spirit.patch b/contrib/debian/patches/1001_use_system_json-spirit.patch
deleted file mode 100644
index 56a20af38c..0000000000
--- a/contrib/debian/patches/1001_use_system_json-spirit.patch
+++ /dev/null
@@ -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
diff --git a/contrib/debian/patches/series b/contrib/debian/patches/series
index bbe3685ac2..8b13789179 100644
--- a/contrib/debian/patches/series
+++ b/contrib/debian/patches/series
@@ -1 +1 @@
-#1001_use_system_json-spirit.patch
+