From 1ca59fee2f305629eab8061e0eb2279325997294 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Thu, 30 Jun 2016 14:11:02 +0200 Subject: [PATCH] * update contrib/debian - this merges the latest Bitcoin changes and should enable us to provide Dash PPAs via https://launchpad.net/~dash.org/+archive/ubuntu/dash Closes #880 --- contrib/debian/README.md | 2 +- contrib/debian/changelog | 72 +++++++++++++++++++++++++++-- contrib/debian/control | 55 ++++++++++++---------- contrib/debian/manpages/dash-cli.1 | 4 +- contrib/debian/manpages/dash-qt.1 | 2 +- contrib/debian/manpages/dash.conf.5 | 2 +- contrib/debian/manpages/dashd.1 | 6 +-- contrib/debian/rules | 8 ++-- contrib/debian/watch | 2 +- 9 files changed, 111 insertions(+), 42 deletions(-) diff --git a/contrib/debian/README.md b/contrib/debian/README.md index 55ff57497f..f943dc3e53 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -15,7 +15,7 @@ To install: If you build yourself, you will either need to modify the paths in the .desktop file or copy or symlink your dash-qt binary to `/usr/bin` -and the `../../share/pixmaps/dash128.png` to `/usr/share/pixmaps` +and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps` dash-qt.protocol (KDE) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index d9f7038411..258f3cc735 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,65 @@ +bitcoin (0.12.1-trusty1) trusty; urgency=medium + + * New upstream release. + + -- Matt Corallo (BlueMatt) Mon, 18 Apr 2016 14:26:00 -0700 + +bitcoin (0.12.0-trusty6) trusty; urgency=medium + + * Fix program-options dep. + + -- Matt Corallo (BlueMatt) Fri, 25 Mar 2016 21:41:00 -0700 + +bitcoin (0.12.0-trusty5) trusty; urgency=medium + + * Test explicit --with-gui + + -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 23:25:00 -0800 + +bitcoin (0.12.0-trusty4) trusty; urgency=medium + + * Fix libevent-dev dep. + + -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 23:25:00 -0800 + +bitcoin (0.12.0-trusty3) trusty; urgency=medium + + * Fix precise boost dep. + + -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:55:00 -0800 + +bitcoin (0.12.0-trusty2) trusty; urgency=medium + + * Fix libevent dep. + + -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:53:00 -0800 + +bitcoin (0.12.0-trusty1) trusty; urgency=medium + + * New upstream release + * Various updates to contrib/debian were merged, a few were not + + -- Matt Corallo (BlueMatt) Tue, 23 Feb 2015 19:29:00 -0800 + +bitcoin (0.11.2-trusty1) trusty; urgency=low + + * New upstream release. + + -- Matt Corallo (BlueMatt) Fri, 13 Nov 2015 18:39:00 -0800 + +bitcoin (0.11.1-trusty2) trusty; urgency=low + + * Remove minupnpc builddep. + + -- Matt Corallo (BlueMatt) Wed, 14 Oct 2015 23:06:00 -1000 + +bitcoin (0.11.1-trusty1) trusty; urgency=high + + * New upstream release. + * Disable all UPnP support. + + -- Matt Corallo (BlueMatt) Wed, 14 Oct 2015 13:57:00 -1000 + bitcoin (0.11.0-precise1) precise; urgency=medium * New upstream release. @@ -179,7 +241,7 @@ bitcoin (0.5.3-natty0) natty; urgency=low bitcoin (0.5.2-natty1) natty; urgency=low * Remove mentions on anonymity in package descriptions and manpage. - These should never have been there, bitcoin isn't anonymous without + These should never have been there, bitcoin isnt anonymous without a ton of work that virtually no users will ever be willing and capable of doing @@ -220,7 +282,7 @@ bitcoin (0.5.0~rc1-natty1) natty; urgency=low * Add test_bitcoin to build test * Fix clean - * Remove unnecessary build-dependancies + * Remove uneccessary build-dependancies -- Matt Corallo Wed, 26 Oct 2011 14:37:18 -0400 @@ -380,7 +442,7 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low bitcoin (0.3.19~dfsg-6) unstable; urgency=low - * Fix override aggressive optimizations. + * Fix override agressive optimizations. * Fix tighten build-dependencies to really fit backporting to Lenny: + Add fallback build-dependency on libdb4.6++-dev. + Tighten unversioned Boost build-dependencies to recent versions, @@ -407,8 +469,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low bitcoin (0.3.19~dfsg-4) unstable; urgency=low [ Micah Anderson ] - * Provide example dash.conf. - * Add bitcoind(1) and dash.conf(5) man pages. + * Provide example bitcoin.conf. + * Add bitcoind(1) and bitcoin.conf(5) man pages. [ Jonas Smedegaard ] * Ease backporting: diff --git a/contrib/debian/control b/contrib/debian/control index bfadd64099..327f9a3043 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,29 +1,30 @@ Source: dash Section: utils Priority: optional -Maintainer: Jonas Smedegaard ***TODO*** -Uploaders: Micah Anderson ***TODO*** +Maintainer: Holger Schinzel +Uploaders: Holger Schinzel Build-Depends: debhelper, devscripts, automake, libtool, bash-completion, - libboost-system-dev (>> 1.35) | libboost-system1.35-dev, libdb4.8++-dev, libssl-dev, pkg-config, - libminiupnpc8-dev | libminiupnpc-dev (>> 1.6), - libboost-filesystem-dev (>> 1.35) | libboost-filesystem1.35-dev, - libboost-program-options-dev (>> 1.35) | libboost-program-options1.35-dev, - libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev, - libboost-test-dev (>> 1.35) | libboost-test1.35-dev, + libevent-dev, + libboost-system1.48-dev | libboost-system-dev (>> 1.35), + libboost-filesystem1.48-dev | libboost-filesystem-dev (>> 1.35), + libboost-program-options1.48-dev | libboost-program-options-dev (>> 1.35), + libboost-thread1.48-dev | libboost-thread-dev (>> 1.35), + libboost-test1.48-dev | libboost-test-dev (>> 1.35), + libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.35), qt4-qmake, libqt4-dev, libqrencode-dev, libprotobuf-dev, protobuf-compiler, python Standards-Version: 3.9.2 -Homepage: https://www.dash.org/ +Homepage: https://dash.org/ Vcs-Git: git://github.com/dashpay/dash.git Vcs-Browser: https://github.com/dashpay/dash @@ -31,11 +32,14 @@ Package: dashd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon - Dash is an experimental new digital currency that enables instant - payments to anyone, anywhere in the world. Dash uses peer-to-peer - technology to operate with no central authority: managing transactions - and issuing money are carried out collectively by the network. Dash Core - is the name of the open source software which enables the use of this currency. + Dash is a free open source peer-to-peer electronic cash system that + is completely decentralized, without the need for a central server or + trusted parties. Users hold the crypto keys to their own money and + transact directly with each other, with the help of a P2P network to + check for double-spending. + . + Full transaction history is stored locally at each client. This + requires 2+ GB of space, slowly growing. . This package provides the daemon, dashd, and the CLI tool dash-cli to interact with the daemon. @@ -44,11 +48,14 @@ Package: dash-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI - Dash is an experimental new digital currency that enables instant - payments to anyone, anywhere in the world. Dash uses peer-to-peer - technology to operate with no central authority: managing transactions - and issuing money are carried out collectively by the network. Dash Core - is the name of the open source software which enables the use of this currency. + Dash is a free open source peer-to-peer electronic cash system that + is completely decentralized, without the need for a central server or + trusted parties. Users hold the crypto keys to their own money and + transact directly with each other, with the help of a P2P network to + check for double-spending. + . + Full transaction history is stored locally at each client. This + requires 2+ GB of space, slowly growing. . This package provides Dash-Qt, a GUI for Dash based on Qt. @@ -56,11 +63,11 @@ Package: dash-tx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer digital currency - standalone transaction tool - Dash is an experimental new digital currency that enables instant - payments to anyone, anywhere in the world. Dash uses peer-to-peer - technology to operate with no central authority: managing transactions - and issuing money are carried out collectively by the network. Dash Core - is the name of the open source software which enables the use of this currency. + Dash is a free open source peer-to-peer electronic cash system that + is completely decentralized, without the need for a central server or + trusted parties. Users hold the crypto keys to their own money and + transact directly with each other, with the help of a P2P network to + check for double-spending. . This package provides dash-tx, a command-line transaction creation tool which can be used without a dash daemon. Some means of diff --git a/contrib/debian/manpages/dash-cli.1 b/contrib/debian/manpages/dash-cli.1 index 6aba770b73..ced0ab1286 100644 --- a/contrib/debian/manpages/dash-cli.1 +++ b/contrib/debian/manpages/dash-cli.1 @@ -1,4 +1,4 @@ -.TH BITCOIN-CLI "1" "February 2016" "dash-cli 0.12" +.TH DASH-CLI "1" "June 2016" "dash-cli 0.12" .SH NAME dash-cli \- a remote procedure call client for Dash Core. .SH SYNOPSIS @@ -14,7 +14,7 @@ This manual page documents the dash-cli program. dash-cli is an RPC client used Show possible options. .SH "SEE ALSO" -\fBdash\fP, \fBdash.conf\fP +\fBdashd\fP, \fBdash.conf\fP .SH AUTHOR This manual page was written by Ciemon Dunville . Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License. diff --git a/contrib/debian/manpages/dash-qt.1 b/contrib/debian/manpages/dash-qt.1 index 1884461774..4e3d821181 100644 --- a/contrib/debian/manpages/dash-qt.1 +++ b/contrib/debian/manpages/dash-qt.1 @@ -1,4 +1,4 @@ -.TH DASH-QT "1" "February 2016" "dash-qt 0.12" +.TH DASH-QT "1" "June 2016" "dash-qt 0.12" .SH NAME dash-qt \- peer-to-peer network based digital currency .SH DESCRIPTION diff --git a/contrib/debian/manpages/dash.conf.5 b/contrib/debian/manpages/dash.conf.5 index 0fb06c23a6..f10dd298a0 100644 --- a/contrib/debian/manpages/dash.conf.5 +++ b/contrib/debian/manpages/dash.conf.5 @@ -1,4 +1,4 @@ -.TH DASH.CONF "5" "February 2016" "dash.conf 0.12" +.TH DASH.CONF "5" "June 2016" "dash.conf 0.12" .SH NAME dash.conf \- dash configuration file .SH SYNOPSIS diff --git a/contrib/debian/manpages/dashd.1 b/contrib/debian/manpages/dashd.1 index 4a7c77bf43..773c498057 100644 --- a/contrib/debian/manpages/dashd.1 +++ b/contrib/debian/manpages/dashd.1 @@ -1,8 +1,8 @@ -.TH DASHD "1" "February 2016" "dashd 0.12" +.TH DASHD "1" "June 2016" "dashd 0.12" .SH NAME -Dash \- peer-to-peer network based digital currency +dashd \- peer-to-peer network based digital currency .SH SYNOPSIS -dashd [options] [params] +dashd [options] [params] .TP dashd [options] help \- Get help for a command .SH DESCRIPTION diff --git a/contrib/debian/rules b/contrib/debian/rules index 23f79be5a2..df23a96d67 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -2,11 +2,11 @@ # -*- mode: makefile; coding: utf-8 -*- #DEB_MAKE_CHECK_TARGET = test_dash -#build/bitcoind:: +#build/dashd:: # $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_dash) -DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/* -DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* +DEB_INSTALL_EXAMPLES_dashd += debian/examples/* +DEB_INSTALL_MANPAGES_dashd += debian/manpages/* %: dh --with bash-completion $@ @@ -18,7 +18,7 @@ override_dh_auto_clean: # Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: ./autogen.sh - ./configure + ./configure --without-miniupnpc --with-gui=qt4 override_dh_auto_test: make check diff --git a/contrib/debian/watch b/contrib/debian/watch index 4d9e0cfa57..c41312066a 100644 --- a/contrib/debian/watch +++ b/contrib/debian/watch @@ -2,4 +2,4 @@ version=3 # use qa.debian.org redirector; see man uscan opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \ - http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz + http://githubredir.debian.net/github/dashpay/dash v(.*).tar.gz