[Pkg-bitcoin-commits] [litecoin] 01/01: New major upstream release [0.10.2.2] + changelog summary.
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sat Jul 4 04:51:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository litecoin.
commit 115e312 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sat Jul 4 04:47:53 2015
New major upstream release [0.10.2.2] + changelog summary.
---
debian/changelog | 26 +++
debian/clean | 15 +-
debian/control | 33 +--
debian/copyright | 115 +++++++++-
debian/litecoin-qt.install | 2 +-
debian/litecoin-qt.lintian-overrides | 2 -
debian/litecoind.docs | 4 +-
debian/litecoind.install | 3 +-
debian/litecoind.lintian-overrides | 4 -
debian/patches/builddate.patch | 25 ---
debian/patches/disable-bitcoin-util-test.patch | 22 ++
debian/patches/series | 9 +-
debian/patches/system-json-spirit.patch | 281 +++++++++++++++++++++++++
debian/patches/system-leveldb.patch | 105 +++++++++
debian/patches/unbundle-leveldb.patch | 84 --------
debian/patches/use_system_json-spirit.patch | 45 ----
debian/rules | 48 ++---
17 files changed, 597 insertions(+), 226 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f9a7115..63228c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+litecoin (0.10.2.2-1) UNRELEASED; urgency=medium
+
+ * New major upstream release [June 2015].
+ * Build system changed to "autoconf" (multiple changes).
+ * GUI switched to QT5.
+ * Build-Depends:
+ - libqt4-dev
+ - qt4-qmake
+ + pkg-config
+ + dh-autoreconf
+ + libprotobuf-dev
+ + protobuf-compiler
+ + qttools5-dev
+ + qttools5-dev-tools
+ * litecoind: install "litecoin-cli" utility.
+ * Minor update to long package description.
+ * Patchworks:
+ - Removed "builddate.patch".
+ + Added "disable-bitcoin-util-test.patch".
+ + Re-done and re-named remaining patches.
+ * Removed obsolete lintian-overrides.
+ * Convert icon reproducibly (Closes: #778984).
+ Thanks, Chris Lamb.
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Fri, 03 Jul 2015 20:04:22 +1000
+
litecoin (0.8.7.5-1) unstable; urgency=medium
* New upstream release [January 2015].
diff --git a/debian/clean b/debian/clean
index d511622..00c3d1c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,11 +2,12 @@ debian/*.png
debian/*.xpm
debian/*.menu
-# GUI test files:
-Makefile_test
-bitcoin-qt_test
+## upstream leftovers:
+config.log
+src/test/*.pyc
+src/*.a
+src/*/*.a
-# upstream leftovers
-build/*.o
-build/build.h
-src/obj/build.h
+## LevelDB, to make sure bundled files are not used:
+src/leveldb/include/*.h
+src/leveldb/include/leveldb/*.h
diff --git a/debian/control b/debian/control
index 30f0481..6637683 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,23 @@ Section: utils
Priority: optional
Maintainer: Debian Bitcoin Packaging Team <pkg-bitcoin-devel at lists.alioth.debian.org>
Uploaders: Dmitry Smirnov <onlyjob at debian.org>
-Build-Depends: debhelper (>= 9), imagemagick
-# ,bash-completion
+Build-Depends: debhelper (>= 9), imagemagick, dh-autoreconf
+# ,bash-completion
+ ,libboost-all-dev
+ ,libdb++-dev
+ ,libleveldb-dev (>= 1.10.0)
+ ,libminiupnpc-dev [!hurd-any]
+ ,libprotobuf-dev
+ ,protobuf-compiler
+ ,libqrencode-dev
+ ,libssl-dev
+ ,qttools5-dev
+ ,qttools5-dev-tools
+ ,pkg-config
# desktop2menu requirements:
- ,devscripts ,libfile-desktopentry-perl
+ ,devscripts ,libfile-desktopentry-perl
# libjson-spirit-dev/4.0.3 (customised) is bundled with upstream sources.
-# ,libjson-spirit-dev
- ,libboost-all-dev
- ,libdb++-dev
- ,libleveldb-dev (>= 1.10.0)
- ,libminiupnpc-dev [!hurd-any]
- ,libqrencode-dev
- ,libqt4-dev
- ,libssl-dev
- ,qt4-qmake
+# ,libjson-spirit-dev
Standards-Version: 3.9.6
Homepage: http://litecoin.org/
VCS-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bitcoin/litecoin.git
@@ -36,9 +39,9 @@ Description: peer-to-peer network based digital currency - daemon
By default connects to an IRC network to discover other peers.
.
Full transaction history is stored locally at each client.
- This requires 2+ GB of space, slowly growing.
+ This requires 5+ GB of space, slowly growing.
.
- This package provides litecoind, a combined daemon and CLI tool to
+ This package provides the daemon (litecoind), and the CLI tool to
interact with the daemon.
Package: litecoin-qt
@@ -55,6 +58,6 @@ Description: peer-to-peer network based digital currency - Qt GUI
By default connects to an IRC network to discover other peers.
.
Full transaction history is stored locally at each client.
- This requires 2+ GB of space, slowly growing.
+ This requires 5+ GB of space, slowly growing.
.
This package provides Litecoin-Qt, a GUI for Litecoin based on Qt.
diff --git a/debian/copyright b/debian/copyright
index 7928d27..8d247a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,10 @@ Upstream-Name: litecoin
Source: https://github.com/litecoin-project/litecoin
Files: *
-Copyright: 2009-2014 Bitcoin Developers
+Copyright: 2009-2015 Bitcoin Developers
2011-2014 Litecoin Developers
2009-2010 Satoshi Nakamoto
- 2012 Pieter Wuille
+ 2012-2014 Pieter Wuille
License: Expat
Comment: see "assets-attribution.txt" for further details.
@@ -15,7 +15,7 @@ Copyright: 2007-2009, John W. Wilkinson
License: Expat
Files: src/leveldb/*
-Copyright: (c) 2011-2013 The LevelDB Authors
+Copyright: (c) 2011-2014 The LevelDB Authors
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -43,8 +43,8 @@ License: BSD-3-clause
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: src/scrypt.cpp
- src/scrypt-sse2.cpp
+Files: src/crypto/scrypt.cpp
+ src/crypto/scrypt-sse2.cpp
Copyright: 2009 Colin Percival
2011 ArtForz
2012-2013 pooler
@@ -78,10 +78,88 @@ Files: contrib/debian/manpages/*
Copyright: Micah Anderson <micah at debian.org>
License: GPL-3+
+Files:
+ contrib/devtools/symbol-check.py
+ contrib/devtools/update-translations.py
+ share/seeds/generate-seeds.py
+Copyright: 2014 Wladimir J. van der Laan
+License: Expat
+
+Files:
+ src/test/bctest.py
+ src/test/univalue_tests.cpp
+ src/univalue/*
+Copyright: 2014 BitPay, Inc.
+License: Expat
+
+Files: pkg.m4
+Copyright: 2004 Scott James Remnant <scott at netsplit.com>
+License: GPL-2+
+
+Files:
+ build-aux/m4/ax_boost_*
+ build-aux/m4/ax_gcc_func_attribute.m4
+Copyright:
+ 2008 Daniel Casimiro <dan.casimiro at gmail.com>
+ 2013 Gabriele Svelto <gabriele.svelto at gmail.com>
+ 2008-2009 Michael Tindal
+ 2009 Peter Adolphs
+ 2009 Roman Rybalko <libtorrent at romanr.info>
+ 2008-2009 Thomas Porschberg <thomas at randspringer.de>
+ 2012 Xiyue Deng <manphiz at gmail.com>
+License: custom
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
+
+Files:
+ build-aux/m4/ax_check_*
+ build-aux/m4/ax_pthread.m4
+Copyright:
+ 2008 Guido U. Draheim <guidod at gmx.de>
+ 2011 Maarten Bosmans <mkbosmans at gmail.com>
+ 2008 Steven G. Johnson <stevenj at alum.mit.edu>
+ 2011 Daniel Richard G. <skunk at iSKUNK.ORG>
+License: GPL-3+
+Comment:
+ As a special exception, the respective Autoconf Macro's copyright owner
+ gives unlimited permission to copy, distribute and modify the configure
+ scripts that are the output of Autoconf when processing the Macro. You
+ need not follow the terms of the GNU General Public License when using
+ or distributing such scripts, even though portions of the text of the
+ Macro appear in them. The GNU General Public License (GPL) does govern
+ all other use of the material that constitutes the Autoconf Macro.
+ .
+ This special exception to the GPL applies to versions of the Autoconf
+ Macro released by the Autoconf Archive. When you make and distribute a
+ modified version of the Autoconf Macro, you may extend this special
+ exception to the GPL to apply to your modified version as well.
+
+Files: qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/authproxy.py
+Copyright:
+ 2011 Jeff Garzik
+ 2007 Jan-Klaas Kollhof
+License: LGPL-2.1+
+ jsonrpc is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+ .
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ The complete text of the GNU Lesser General Public License version 2.1
+ can be found in "/usr/share/common-licenses/LGPL-2.1".
+
Files: debian/*
Copyright: 2012-2015 Dmitry Smirnov <onlyjob at debian.org>
2010-2011 Jonas Smedegaard <dr at jones.dk>
License: GPL-2+
+
+License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -98,6 +176,33 @@ License: GPL-2+
The complete text of the GNU General Public License version 2
can be found in "/usr/share/common-licenses/GPL-2".
+Files: src/tinyformat.h
+Copyright: 2011, Chris Foster [chris42f (at) gmail (d0t) com]
+License: Boost-1.0
+ Boost Software License - Version 1.0
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/litecoin-qt.install b/debian/litecoin-qt.install
index 2e6fc2d..109a67b 100644
--- a/debian/litecoin-qt.install
+++ b/debian/litecoin-qt.install
@@ -1,4 +1,4 @@
-litecoin-qt usr/lib/litecoin
+usr/bin/litecoin-qt usr/lib/litecoin
debian/bin/litecoin usr/bin
debian/*.png usr/share/pixmaps
debian/*.xpm usr/share/pixmaps
diff --git a/debian/litecoin-qt.lintian-overrides b/debian/litecoin-qt.lintian-overrides
deleted file mode 100644
index ddc96aa..0000000
--- a/debian/litecoin-qt.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Linked code is Expat - only Debian packaging is GPL-2+
-litecoin-qt: possible-gpl-code-linked-with-openssl
diff --git a/debian/litecoind.docs b/debian/litecoind.docs
index 2633043..01670c0 100644
--- a/debian/litecoind.docs
+++ b/debian/litecoind.docs
@@ -1,3 +1,3 @@
README.md
-doc/assets-attribution.txt
-doc/Tor.txt
+doc/tor.md
+doc/release-notes
diff --git a/debian/litecoind.install b/debian/litecoind.install
index bb440d4..d2401c1 100644
--- a/debian/litecoind.install
+++ b/debian/litecoind.install
@@ -1,2 +1,3 @@
-src/litecoind usr/lib/litecoin
+usr/bin/litecoin-cli
+usr/bin/litecoind usr/lib/litecoin
debian/bin/litecoind usr/bin
diff --git a/debian/litecoind.lintian-overrides b/debian/litecoind.lintian-overrides
deleted file mode 100644
index 064cd0b..0000000
--- a/debian/litecoind.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# Linked code is Expat - only Debian packaging is GPL-2+
-possible-gpl-code-linked-with-openssl
-
-manpage-has-errors-from-man usr/share/man/man5/litecoin.conf.5.gz 58:*
diff --git a/debian/patches/builddate.patch b/debian/patches/builddate.patch
deleted file mode 100644
index cfb04f0..0000000
--- a/debian/patches/builddate.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Last-Update: 2013-11-20
-Forwarded: not-needed
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: provide build date information.
-
---- a/share/genbuild.sh
-+++ b/share/genbuild.sh
-@@ -1,6 +1,5 @@
- #!/bin/sh
--
- if [ $# -gt 0 ]; then
- FILE="$1"
- shift
- if [ -f "$FILE" ]; then
-@@ -10,8 +9,10 @@
- echo "Usage: $0 <filename>"
- exit 1
- fi
-
-+TIME=$(date '+%F %T %z')
-+
- if [ -e "$(which git)" ]; then
- # clean 'dirty' status of touched files that haven't been modified
- git diff >/dev/null 2>/dev/null
-
diff --git a/debian/patches/disable-bitcoin-util-test.patch b/debian/patches/disable-bitcoin-util-test.patch
new file mode 100644
index 0000000..65a7afd
--- /dev/null
+++ b/debian/patches/disable-bitcoin-util-test.patch
@@ -0,0 +1,22 @@
+Last-Update: 2015-07-04
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Forwarded: not-needed
+Description: disable failing test.
+
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -1,12 +1,12 @@
+-TESTS += test/test_litecoin test/bitcoin-util-test.py
++TESTS += test/test_litecoin
++# test/bitcoin-util-test.py
+ bin_PROGRAMS += test/test_litecoin
+ TEST_SRCDIR = test
+ TEST_BINARY=test/test_litecoin$(EXEEXT)
+
+ EXTRA_DIST += \
+ test/bctest.py \
+- test/bitcoin-util-test.py \
+ test/data/bitcoin-util-test.json \
+ test/data/blanktx.hex \
+ test/data/tt-delin1-out.hex \
+ test/data/tt-delout1-out.hex \
diff --git a/debian/patches/series b/debian/patches/series
index 6ffe246..556e537 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
-builddate.patch
-unbundle-leveldb.patch
-#use_system_json-spirit.patch
+disable-bitcoin-util-test.patch
+
+## disabled due to local modifications:
+#system-json-spirit.patch
+
+system-leveldb.patch
diff --git a/debian/patches/system-json-spirit.patch b/debian/patches/system-json-spirit.patch
new file mode 100644
index 0000000..15a9a31
--- /dev/null
+++ b/debian/patches/system-json-spirit.patch
@@ -0,0 +1,281 @@
+Last-Update: 2015-07-04
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Forwarded: not-needed
+Description: Use system JSON Spirit library (libjson-spirit-dev)
+ Doesn't work due to bundled customisations (search for "Bitcoin" in json/*.h).
+ ~~~~
+ rpcserver.cpp: In function ‘void RPCTypeCheck(const Array&, const std::list<json_spirit::Value_type>&, bool)’:
+ rpcserver.cpp:64:36: error: ‘Value_type_name’ was not declared in this scope
+ Value_type_name[t] Value_type_name[v.type(]
+ ^
+ rpcserver.cpp: In function ‘void RPCTypeCheck(const Object&, const std::map<std::basic_string<char>, json_spirit::Value_type>&, bool)’:
+ rpcserver.cpp:84:36: error: ‘Value_type_name’ was not declared in this scope
+ Value_type_name[t.second] t.first, Value_type_name[v.type(]
+ ^
+ ~~~~
+
+--- a/src/rpcprotocol.h
++++ b/src/rpcprotocol.h
+@@ -14,11 +14,11 @@
+ #include <boost/iostreams/stream.hpp>
+ #include <boost/asio.hpp>
+ #include <boost/asio/ssl.hpp>
+
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_reader_template.h>
++#include <json_spirit_utils.h>
++#include <json_spirit_writer_template.h>
+
+ //! HTTP status codes
+ enum HTTPStatusCode
+ {
+--- a/src/rpcserver.h
++++ b/src/rpcserver.h
+@@ -14,11 +14,11 @@
+ #include <map>
+ #include <stdint.h>
+ #include <string>
+
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_reader_template.h>
++#include <json_spirit_utils.h>
++#include <json_spirit_writer_template.h>
+
+ class CBlockIndex;
+ class CNetAddr;
+
+--- a/src/rpcblockchain.cpp
++++ b/src/rpcblockchain.cpp
+@@ -10,9 +10,9 @@
+ #include "util.h"
+
+ #include <stdint.h>
+
+-#include "json/json_spirit_value.h"
++#include <json_spirit_value.h>
+
+ using namespace json_spirit;
+ using namespace std;
+
+--- a/src/rpcmining.cpp
++++ b/src/rpcmining.cpp
+@@ -21,10 +21,10 @@
+ #include <stdint.h>
+
+ #include <boost/assign/list_of.hpp>
+
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_value.h"
++#include <json_spirit_utils.h>
++#include <json_spirit_value.h>
+
+ using namespace json_spirit;
+ using namespace std;
+
+--- a/src/rpcmisc.cpp
++++ b/src/rpcmisc.cpp
+@@ -19,10 +19,10 @@
+
+ #include <stdint.h>
+
+ #include <boost/assign/list_of.hpp>
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_value.h"
++#include <json_spirit_utils.h>
++#include <json_spirit_value.h>
+
+ using namespace boost;
+ using namespace boost::assign;
+ using namespace json_spirit;
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -184,9 +184,8 @@
+ script/sigcache.cpp \
+ timedata.cpp \
+ txdb.cpp \
+ txmempool.cpp \
+- $(JSON_H) \
+ $(BITCOIN_CORE_H)
+
+ # wallet: shared between bitcoind and bitcoin-qt, but only linked
+ # when wallet enabled
+--- a/src/qt/rpcconsole.cpp
++++ b/src/qt/rpcconsole.cpp
+@@ -14,9 +14,9 @@
+ #include "rpcserver.h"
+ #include "rpcclient.h"
+ #include "util.h"
+
+-#include "json/json_spirit_value.h"
++#include <json_spirit_value.h>
+
+ #include <openssl/crypto.h>
+
+ #ifdef ENABLE_WALLET
+--- a/src/rpcclient.h
++++ b/src/rpcclient.h
+@@ -5,11 +5,11 @@
+
+ #ifndef BITCOIN_RPCCLIENT_H
+ #define BITCOIN_RPCCLIENT_H
+
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_reader_template.h>
++#include <json_spirit_utils.h>
++#include <json_spirit_writer_template.h>
+
+ json_spirit::Array RPCConvertValues(const std::string& strMethod, const std::vector<std::string>& strParams);
+
+ #endif // BITCOIN_RPCCLIENT_H
+--- a/src/rpcdump.cpp
++++ b/src/rpcdump.cpp
+@@ -18,9 +18,9 @@
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/date_time/posix_time/posix_time.hpp>
+
+-#include "json/json_spirit_value.h"
++#include <json_spirit_value.h>
+
+ using namespace json_spirit;
+ using namespace std;
+
+--- a/src/rpcnet.cpp
++++ b/src/rpcnet.cpp
+@@ -15,9 +15,9 @@
+ #include "version.h"
+
+ #include <boost/foreach.hpp>
+
+-#include "json/json_spirit_value.h"
++#include <json_spirit_value.h>
+
+ using namespace json_spirit;
+ using namespace std;
+
+--- a/src/rpcprotocol.cpp
++++ b/src/rpcprotocol.cpp
+@@ -22,9 +22,9 @@
+ #include <boost/foreach.hpp>
+ #include <boost/iostreams/concepts.hpp>
+ #include <boost/iostreams/stream.hpp>
+ #include <boost/shared_ptr.hpp>
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_writer_template.h>
+
+ using namespace std;
+ using namespace boost;
+ using namespace boost::asio;
+--- a/src/rpcrawtransaction.cpp
++++ b/src/rpcrawtransaction.cpp
+@@ -21,10 +21,10 @@
+
+ #include <stdint.h>
+
+ #include <boost/assign/list_of.hpp>
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_value.h"
++#include <json_spirit_utils.h>
++#include <json_spirit_value.h>
+
+ using namespace boost;
+ using namespace boost::assign;
+ using namespace json_spirit;
+--- a/src/rpcserver.cpp
++++ b/src/rpcserver.cpp
+@@ -23,9 +23,9 @@
+ #include <boost/iostreams/concepts.hpp>
+ #include <boost/iostreams/stream.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/thread.hpp>
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_writer_template.h>
+
+ using namespace boost;
+ using namespace boost::asio;
+ using namespace json_spirit;
+--- a/src/rpcwallet.cpp
++++ b/src/rpcwallet.cpp
+@@ -18,10 +18,10 @@
+
+ #include <stdint.h>
+
+ #include <boost/assign/list_of.hpp>
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_value.h"
++#include <json_spirit_utils.h>
++#include <json_spirit_value.h>
+
+ using namespace std;
+ using namespace boost;
+ using namespace boost::assign;
+--- a/src/test/base58_tests.cpp
++++ b/src/test/base58_tests.cpp
+@@ -15,11 +15,11 @@
+ #include "utilstrencodings.h"
+
+ #include <boost/foreach.hpp>
+ #include <boost/test/unit_test.hpp>
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_reader_template.h>
++#include <json_spirit_utils.h>
++#include <json_spirit_writer_template.h>
+
+ using namespace json_spirit;
+ extern Array read_json(const std::string& jsondata);
+
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -30,11 +30,11 @@
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <boost/foreach.hpp>
+ #include <boost/test/unit_test.hpp>
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_reader_template.h>
++#include <json_spirit_utils.h>
++#include <json_spirit_writer_template.h>
+
+ using namespace std;
+ using namespace json_spirit;
+ using namespace boost::algorithm;
+--- a/src/test/sighash_tests.cpp
++++ b/src/test/sighash_tests.cpp
+@@ -13,11 +13,11 @@
+
+ #include <iostream>
+
+ #include <boost/test/unit_test.hpp>
+-#include "json/json_spirit_reader_template.h"
+-#include "json/json_spirit_utils.h"
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_reader_template.h>
++#include <json_spirit_utils.h>
++#include <json_spirit_writer_template.h>
+
+ using namespace json_spirit;
+ extern Array read_json(const std::string& jsondata);
+
+--- a/src/test/transaction_tests.cpp
++++ b/src/test/transaction_tests.cpp
+@@ -19,9 +19,9 @@
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/split.hpp>
+ #include <boost/test/unit_test.hpp>
+ #include <boost/assign/list_of.hpp>
+-#include "json/json_spirit_writer_template.h"
++#include <json_spirit_writer_template.h>
+
+ using namespace std;
+ using namespace json_spirit;
+ using namespace boost::algorithm;
diff --git a/debian/patches/system-leveldb.patch b/debian/patches/system-leveldb.patch
new file mode 100644
index 0000000..2c27822
--- /dev/null
+++ b/debian/patches/system-leveldb.patch
@@ -0,0 +1,105 @@
+Last-Update: 2015-07-04
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Forwarded: not-needed
+Description: use system libleveldb-dev instead of a bundled one.
+
+--- a/src/leveldbwrapper.cpp
++++ b/src/leveldbwrapper.cpp
+@@ -10,9 +10,9 @@
+
+ #include <leveldb/cache.h>
+ #include <leveldb/env.h>
+ #include <leveldb/filter_policy.h>
+-#include <memenv.h>
++#include <leveldb/helpers/memenv.h>
+
+ void HandleError(const leveldb::Status& status) throw(leveldb_error)
+ {
+ if (status.ok())
+--- a/configure.ac
++++ b/configure.ac
+@@ -498,9 +498,9 @@
+
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[false])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,8 +15,10 @@
+ @echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \
+ CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
+ OPT="$(CXXFLAGS) $(CPPFLAGS)"
+ endif
++LIBLEVELDB += -lleveldb
++LIBMEMENV += -lmemenv
+
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+
+@@ -383,18 +385,16 @@
+ libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
+ endif
+ endif
+
+-CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno
++CLEANFILES = *.gcda *.gcno
+
+ DISTCLEANFILES = obj/build.h
+
+-EXTRA_DIST = leveldb
++EXTRA_DIST =
+
+ clean-local:
+- -$(MAKE) -C leveldb clean
+ -$(MAKE) -C secp256k1 clean
+- rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno
+ -rm -f config.h
+
+ .rc.o:
+ @test -f $(WINDRES)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,16 +35,13 @@
+ baseline_filtered.info block_test_filtered.info \
+ leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
+
+ dist-hook:
+- -$(MAKE) -C $(top_distdir)/src/leveldb clean
+ -$(MAKE) -C $(top_distdir)/src/secp256k1 distclean
+ -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
+
+ distcheck-hook:
+- $(MKDIR_P) $(top_distdir)/_build/src/leveldb
+- cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
+- -$(MAKE) -C $(top_distdir)/_build/src/leveldb clean
++ @:
+
+ distcleancheck:
+ @:
+
+@@ -150,9 +147,8 @@
+ test_bitcoin.info: baseline_filtered_combined.info
+ $(MAKE) -C src/ check
+ $(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
+ $(LCOV) -z -d $(abs_builddir)/src
+- $(LCOV) -z -d $(abs_builddir)/src/leveldb
+
+ test_bitcoin_filtered.info: test_bitcoin.info
+ $(LCOV) -r $< "/usr/include/*" -o $@
+
+@@ -160,9 +156,8 @@
+ $(MKDIR_P) qa/tmp
+ - at TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
+ $(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
+ $(LCOV) -z -d $(abs_builddir)/src
+- $(LCOV) -z -d $(abs_builddir)/src/leveldb
+
+ block_test_filtered.info: block_test.info
+ $(LCOV) -r $< "/usr/include/*" -o $@
+
diff --git a/debian/patches/unbundle-leveldb.patch b/debian/patches/unbundle-leveldb.patch
deleted file mode 100644
index 78a8d17..0000000
--- a/debian/patches/unbundle-leveldb.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Last-Update: 2014-04-10
-Forwarded: not-needed
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: use system libleveldb-dev instead of a bundled one.
-
---- a/bitcoin-qt.pro
-+++ b/bitcoin-qt.pro
-@@ -100,27 +100,9 @@
- DEFINES += BITCOIN_NEED_QT_PLUGINS
- QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
- }
-
--INCLUDEPATH += src/leveldb/include src/leveldb/helpers
--LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
--!win32 {
-- # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
-- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
--} else {
-- # make an educated guess about what the ranlib command is called
-- isEmpty(QMAKE_RANLIB) {
-- QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
-- }
-- LIBS += -lshlwapi
-- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
--}
--genleveldb.target = $$PWD/src/leveldb/libleveldb.a
--genleveldb.depends = FORCE
--PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
--QMAKE_EXTRA_TARGETS += genleveldb
--# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
--QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
-+LIBS += -lleveldb -lmemenv
-
- # regenerate src/build.h
- !win32|contains(USE_BUILD_INFO, 1) {
- genbuild.depends = FORCE
---- a/src/makefile.unix
-+++ b/src/makefile.unix
-@@ -110,9 +110,8 @@
- # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
- xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
-
- OBJS= \
-- leveldb/libleveldb.a \
- obj/alert.o \
- obj/version.o \
- obj/checkpoints.o \
- obj/netbase.o \
-@@ -159,13 +158,9 @@
- #
- # LevelDB support
- #
- MAKEOVERRIDES =
--LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
--DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
--DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
--leveldb/libleveldb.a:
-- @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
-+LIBS += -lleveldb -lmemenv
-
- # auto-generated dependencies:
- -include obj/*.P
- -include obj-test/*.P
-@@ -210,7 +205,6 @@
- -rm -f obj-test/*.o
- -rm -f obj/*.P
- -rm -f obj-test/*.P
- -rm -f obj/build.h
-- -cd leveldb && $(MAKE) clean || true
-
- FORCE:
---- a/src/leveldb.cpp
-+++ b/src/leveldb.cpp
-@@ -7,9 +7,9 @@
-
- #include <leveldb/env.h>
- #include <leveldb/cache.h>
- #include <leveldb/filter_policy.h>
--#include <memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
-
- #include <boost/filesystem.hpp>
-
- void HandleError(const leveldb::Status &status) throw(leveldb_error) {
diff --git a/debian/patches/use_system_json-spirit.patch b/debian/patches/use_system_json-spirit.patch
deleted file mode 100644
index e2f3bb1..0000000
--- a/debian/patches/use_system_json-spirit.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Last-Update: 2012-11-16
-Author: Jonas Smedegaard <dr at jones.dk>
-Reviewed-by: Dmitry Smirnov <onlyjob at member.fsf.org>
-Forwarded: not-needed
-Description: Use system JSON Spirit library (libjson-spirit-dev)
- Doesn't work due to bundled customisations (search for "Bitcoin" in json/*.h).
- Causing post-build tests failures:
- .
- test/rpc_tests.cpp(43): error in "rpc_addmultisig": exception thrown by v = addmultisig(createArgs(1, address1Hex), false)
- unknown location(0): fatal error in "rpc_addmultisig": std::runtime_error: value type is 6 not 2
- test/rpc_tests.cpp(43): last checkpoint
- unknown location(0): fatal error in "script_valid": memory access violation at address: 0x0000000a: no mapping at fault address
- test/script_P2SH_tests.cpp(327): last checkpoint
- .
- *** 3 failures detected in test suite "Bitcoin Test Suite"
-
---- a/src/bitcoinrpc.h
-+++ b/src/bitcoinrpc.h
-@@ -9,11 +9,11 @@
-
- #include <string>
- #include <map>
-
--#include "json/json_spirit_reader_template.h"
--#include "json/json_spirit_writer_template.h"
--#include "json/json_spirit_utils.h"
-+#include <json_spirit_reader_template.h>
-+#include <json_spirit_writer_template.h>
-+#include <json_spirit_utils.h>
-
- json_spirit::Object JSONRPCError(int code, const std::string& message);
-
- void ThreadRPCServer(void* parg);
---- a/src/makefile.unix
-+++ b/src/makefile.unix
-@@ -30,8 +30,9 @@
- -l boost_program_options$(BOOST_LIB_SUFFIX) \
- -l boost_thread$(BOOST_LIB_SUFFIX) \
- -l db_cxx$(BDB_LIB_SUFFIX) \
- -l ssl \
-+ -l json_spirit \
- -l crypto
-
- ifndef USE_UPNP
- override USE_UPNP = -
diff --git a/debian/rules b/debian/rules
index 56740e1..2af39ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,40 +4,25 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-%:
- dh $@ --parallel
- # --with bash-completion
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+export QT_SELECT=5
-override_dh_auto_clean:
- dh_auto_clean
- $(MAKE) -C src -f makefile.unix clean
+%:
+ dh $@ --parallel --with autoreconf
+# --with bash-completion
-C_UPNP = $(if $(shell dpkg --status libminiupnpc-dev 2>/dev/null),1,-)
override_dh_auto_configure:
- ## update translations
- lupdate bitcoin-qt.pro -silent
- ## make GUI tests Makefile
- qmake bitcoin-qt.pro USE_QRCODE=1 USE_DBUS=1 USE_UPNP=$(C_UPNP) RELEASE=0 BITCOIN_QT_TEST=1
- mv Makefile Makefile_test
- ## make GUI Makefile
- qmake bitcoin-qt.pro USE_QRCODE=1 USE_DBUS=1 USE_UPNP=$(C_UPNP) RELEASE=0
- ## Hardening
- perl -0pi -e 's[(CXXFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}]; \
- s[(LFLAGS\s*=)][$$1 -Wl,--as-needed $$ENV{LDFLAGS}]; \
- s[(CFLAGS\s*=)][$$1 $$ENV{CFLAGS} $$ENV{CPPFLAGS}];' \
- $$(find . -name 'Makefile*')
+ dh_auto_configure -- \
+ --disable-silent-rules \
+ --disable-shared \
+ --disable-static \
+ --disable-ccache \
+ --with-incompatible-bdb \
+ --with-gui=qt5 \
+
override_dh_auto_build:
- ## build GUI test
- $(MAKE) -f Makefile_test
- ## 'clean' before building GUI (test executable will not be deleted)
- $(MAKE) -f Makefile_test clean
- ## build GUI
- dh_auto_build
- ## build console app.
- $(MAKE) -C src -f makefile.unix litecoind USE_UPNP=$(C_UPNP)
- ## build console app. test
- $(MAKE) -C src -f makefile.unix test_litecoin USE_UPNP=$(C_UPNP)
+ dh_auto_build --parallel
## build menu and icons
convert src/qt/res/icons/bitcoin.png -resize 32x32 $(CURDIR)/debian/litecoin.xpm
convert src/qt/res/icons/bitcoin.png -resize 64x64 +set date:create +set date:modify -define png:exclude-chunk=time $(CURDIR)/debian/litecoin.png
@@ -45,11 +30,10 @@ override_dh_auto_build:
override_dh_auto_test:
## Set $HOME to debian/tmp since buildd do not have RW permission to /home/buildd.
- HOME=$(CURDIR)/debian/tmp src/test_litecoin
- HOME=$(CURDIR)/debian/tmp ./litecoin-qt_test
+ HOME=$(CURDIR)/debian/tmp dh_auto_test
override_dh_installchangelogs:
- dh_installchangelogs doc/release-notes.md
+ dh_installchangelogs doc/release-notes-litecoin.md
DPATH := $(abspath $(dir $(MAKEFILE_LIST)))
VER ?= $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+[a-z]?)}')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/litecoin.git
More information about the Pkg-bitcoin-commits
mailing list