From 9c302a77da79f53e609c32b93fbcfcb9ad75ee0a Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Thu, 30 Jun 2016 19:21:00 +0200 Subject: [PATCH] Merge #896: Enable PPA builds 1ca59fe update contrib/debian 7ad1ea8 fix some nits 05e0a12 updated pixmap references to dash da7ef9c rename - bitcoin*.png to dash*.png - bitcoin*.xpm to dash*.xpm d0d2f05 Update Dash description in Debian control to match the description in the main README.md file 3dc2bab Update Dash description in Debian control to match the description in the main README.md file - 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 --- README.md | 2 +- contrib/debian/changelog | 72 ++++++++++++++++-- contrib/debian/control | 23 +++--- contrib/debian/dash-qt.install | 6 +- 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 +- share/pixmaps/{bitcoin128.png => dash128.png} | Bin share/pixmaps/{bitcoin128.xpm => dash128.xpm} | 0 share/pixmaps/{bitcoin16.png => dash16.png} | Bin share/pixmaps/{bitcoin16.xpm => dash16.xpm} | 0 share/pixmaps/{bitcoin256.png => dash256.png} | Bin share/pixmaps/{bitcoin256.xpm => dash256.xpm} | 0 share/pixmaps/{bitcoin32.png => dash32.png} | Bin share/pixmaps/{bitcoin32.xpm => dash32.xpm} | 0 share/pixmaps/{bitcoin64.png => dash64.png} | Bin share/pixmaps/{bitcoin64.xpm => dash64.xpm} | 0 20 files changed, 95 insertions(+), 32 deletions(-) rename share/pixmaps/{bitcoin128.png => dash128.png} (100%) rename share/pixmaps/{bitcoin128.xpm => dash128.xpm} (100%) rename share/pixmaps/{bitcoin16.png => dash16.png} (100%) rename share/pixmaps/{bitcoin16.xpm => dash16.xpm} (100%) rename share/pixmaps/{bitcoin256.png => dash256.png} (100%) rename share/pixmaps/{bitcoin256.xpm => dash256.xpm} (100%) rename share/pixmaps/{bitcoin32.png => dash32.png} (100%) rename share/pixmaps/{bitcoin32.xpm => dash32.xpm} (100%) rename share/pixmaps/{bitcoin64.png => dash64.png} (100%) rename share/pixmaps/{bitcoin64.xpm => dash64.xpm} (100%) diff --git a/README.md b/README.md index 337c08ae1..9354fa8e4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ What is Dash? Dash is an experimental new digital currency that enables anonymous, 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 open +are carried out collectively by the network. Dash Core is the name of the open source software which enables the use of this currency. For more information, as well as an immediately useable, binary version of diff --git a/contrib/debian/changelog b/contrib/debian/changelog index d9f703841..258f3cc73 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 bfadd6409..77454600e 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,22 +1,23 @@ 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, @@ -31,7 +32,7 @@ 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 + Dash is an experimental new digital currency that enables anonymous, 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 @@ -44,7 +45,7 @@ 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 + Dash is an experimental new digital currency that enables anonymous, 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 @@ -56,7 +57,7 @@ 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 + Dash is an experimental new digital currency that enables anonymous, 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 diff --git a/contrib/debian/dash-qt.install b/contrib/debian/dash-qt.install index 4c10ef60d..c034a1366 100644 --- a/contrib/debian/dash-qt.install +++ b/contrib/debian/dash-qt.install @@ -1,6 +1,6 @@ usr/local/bin/dash-qt usr/bin -share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin16.xpm usr/share/pixmaps -share/pixmaps/bitcoin128.png usr/share/pixmaps +share/pixmaps/dash32.xpm usr/share/pixmaps +share/pixmaps/dash16.xpm usr/share/pixmaps +share/pixmaps/dash128.png usr/share/pixmaps debian/dash-qt.desktop usr/share/applications debian/dash-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/manpages/dash-cli.1 b/contrib/debian/manpages/dash-cli.1 index 6aba770b7..ced0ab128 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 188446177..4e3d82118 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 0fb06c23a..f10dd298a 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 4a7c77bf4..c92e70769 100644 --- a/contrib/debian/manpages/dashd.1 +++ b/contrib/debian/manpages/dashd.1 @@ -1,12 +1,12 @@ -.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] .TP dashd [options] help \- Get help for a command .SH DESCRIPTION -This manual page documents the dashd program. 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 open source software which enables the use of this currency. +This manual page documents the dashd program. Dash is an experimental new digital currency that enables anonymous, 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. .SH OPTIONS .TP diff --git a/contrib/debian/rules b/contrib/debian/rules index 23f79be5a..df23a96d6 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 4d9e0cfa5..c41312066 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 diff --git a/share/pixmaps/bitcoin128.png b/share/pixmaps/dash128.png similarity index 100% rename from share/pixmaps/bitcoin128.png rename to share/pixmaps/dash128.png diff --git a/share/pixmaps/bitcoin128.xpm b/share/pixmaps/dash128.xpm similarity index 100% rename from share/pixmaps/bitcoin128.xpm rename to share/pixmaps/dash128.xpm diff --git a/share/pixmaps/bitcoin16.png b/share/pixmaps/dash16.png similarity index 100% rename from share/pixmaps/bitcoin16.png rename to share/pixmaps/dash16.png diff --git a/share/pixmaps/bitcoin16.xpm b/share/pixmaps/dash16.xpm similarity index 100% rename from share/pixmaps/bitcoin16.xpm rename to share/pixmaps/dash16.xpm diff --git a/share/pixmaps/bitcoin256.png b/share/pixmaps/dash256.png similarity index 100% rename from share/pixmaps/bitcoin256.png rename to share/pixmaps/dash256.png diff --git a/share/pixmaps/bitcoin256.xpm b/share/pixmaps/dash256.xpm similarity index 100% rename from share/pixmaps/bitcoin256.xpm rename to share/pixmaps/dash256.xpm diff --git a/share/pixmaps/bitcoin32.png b/share/pixmaps/dash32.png similarity index 100% rename from share/pixmaps/bitcoin32.png rename to share/pixmaps/dash32.png diff --git a/share/pixmaps/bitcoin32.xpm b/share/pixmaps/dash32.xpm similarity index 100% rename from share/pixmaps/bitcoin32.xpm rename to share/pixmaps/dash32.xpm diff --git a/share/pixmaps/bitcoin64.png b/share/pixmaps/dash64.png similarity index 100% rename from share/pixmaps/bitcoin64.png rename to share/pixmaps/dash64.png diff --git a/share/pixmaps/bitcoin64.xpm b/share/pixmaps/dash64.xpm similarity index 100% rename from share/pixmaps/bitcoin64.xpm rename to share/pixmaps/dash64.xpm