Skip to content

Commit 1ca59fe

Browse files
committed
* 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
1 parent 9764e22 commit 1ca59fe

File tree

9 files changed

+111
-42
lines changed

9 files changed

+111
-42
lines changed

contrib/debian/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To install:
1515

1616
If you build yourself, you will either need to modify the paths in
1717
the .desktop file or copy or symlink your dash-qt binary to `/usr/bin`
18-
and the `../../share/pixmaps/dash128.png` to `/usr/share/pixmaps`
18+
and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps`
1919

2020
dash-qt.protocol (KDE)
2121

contrib/debian/changelog

+67-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,65 @@
1+
bitcoin (0.12.1-trusty1) trusty; urgency=medium
2+
3+
* New upstream release.
4+
5+
-- Matt Corallo (BlueMatt) <[email protected]> Mon, 18 Apr 2016 14:26:00 -0700
6+
7+
bitcoin (0.12.0-trusty6) trusty; urgency=medium
8+
9+
* Fix program-options dep.
10+
11+
-- Matt Corallo (BlueMatt) <[email protected]> Fri, 25 Mar 2016 21:41:00 -0700
12+
13+
bitcoin (0.12.0-trusty5) trusty; urgency=medium
14+
15+
* Test explicit --with-gui
16+
17+
-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 23:25:00 -0800
18+
19+
bitcoin (0.12.0-trusty4) trusty; urgency=medium
20+
21+
* Fix libevent-dev dep.
22+
23+
-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 23:25:00 -0800
24+
25+
bitcoin (0.12.0-trusty3) trusty; urgency=medium
26+
27+
* Fix precise boost dep.
28+
29+
-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 19:55:00 -0800
30+
31+
bitcoin (0.12.0-trusty2) trusty; urgency=medium
32+
33+
* Fix libevent dep.
34+
35+
-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 19:53:00 -0800
36+
37+
bitcoin (0.12.0-trusty1) trusty; urgency=medium
38+
39+
* New upstream release
40+
* Various updates to contrib/debian were merged, a few were not
41+
42+
-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 19:29:00 -0800
43+
44+
bitcoin (0.11.2-trusty1) trusty; urgency=low
45+
46+
* New upstream release.
47+
48+
-- Matt Corallo (BlueMatt) <[email protected]> Fri, 13 Nov 2015 18:39:00 -0800
49+
50+
bitcoin (0.11.1-trusty2) trusty; urgency=low
51+
52+
* Remove minupnpc builddep.
53+
54+
-- Matt Corallo (BlueMatt) <[email protected]> Wed, 14 Oct 2015 23:06:00 -1000
55+
56+
bitcoin (0.11.1-trusty1) trusty; urgency=high
57+
58+
* New upstream release.
59+
* Disable all UPnP support.
60+
61+
-- Matt Corallo (BlueMatt) <[email protected]> Wed, 14 Oct 2015 13:57:00 -1000
62+
163
bitcoin (0.11.0-precise1) precise; urgency=medium
264

365
* New upstream release.
@@ -179,7 +241,7 @@ bitcoin (0.5.3-natty0) natty; urgency=low
179241
bitcoin (0.5.2-natty1) natty; urgency=low
180242

181243
* Remove mentions on anonymity in package descriptions and manpage.
182-
These should never have been there, bitcoin isn't anonymous without
244+
These should never have been there, bitcoin isnt anonymous without
183245
a ton of work that virtually no users will ever be willing and
184246
capable of doing
185247

@@ -220,7 +282,7 @@ bitcoin (0.5.0~rc1-natty1) natty; urgency=low
220282

221283
* Add test_bitcoin to build test
222284
* Fix clean
223-
* Remove unnecessary build-dependancies
285+
* Remove uneccessary build-dependancies
224286

225287
-- Matt Corallo <[email protected]> Wed, 26 Oct 2011 14:37:18 -0400
226288

@@ -380,7 +442,7 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low
380442

381443
bitcoin (0.3.19~dfsg-6) unstable; urgency=low
382444

383-
* Fix override aggressive optimizations.
445+
* Fix override agressive optimizations.
384446
* Fix tighten build-dependencies to really fit backporting to Lenny:
385447
+ Add fallback build-dependency on libdb4.6++-dev.
386448
+ Tighten unversioned Boost build-dependencies to recent versions,
@@ -407,8 +469,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low
407469
bitcoin (0.3.19~dfsg-4) unstable; urgency=low
408470

409471
[ Micah Anderson ]
410-
* Provide example dash.conf.
411-
* Add bitcoind(1) and dash.conf(5) man pages.
472+
* Provide example bitcoin.conf.
473+
* Add bitcoind(1) and bitcoin.conf(5) man pages.
412474

413475
[ Jonas Smedegaard ]
414476
* Ease backporting:

contrib/debian/control

+31-24
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
11
Source: dash
22
Section: utils
33
Priority: optional
4-
Maintainer: Jonas Smedegaard <[email protected]> ***TODO***
5-
Uploaders: Micah Anderson <micah@debian.org> ***TODO***
4+
Maintainer: Holger Schinzel <[email protected]>
5+
Uploaders: Holger Schinzel <holger@dash.org>
66
Build-Depends: debhelper,
77
devscripts,
88
automake,
99
libtool,
1010
bash-completion,
11-
libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
1211
libdb4.8++-dev,
1312
libssl-dev,
1413
pkg-config,
15-
libminiupnpc8-dev | libminiupnpc-dev (>> 1.6),
16-
libboost-filesystem-dev (>> 1.35) | libboost-filesystem1.35-dev,
17-
libboost-program-options-dev (>> 1.35) | libboost-program-options1.35-dev,
18-
libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev,
19-
libboost-test-dev (>> 1.35) | libboost-test1.35-dev,
14+
libevent-dev,
15+
libboost-system1.48-dev | libboost-system-dev (>> 1.35),
16+
libboost-filesystem1.48-dev | libboost-filesystem-dev (>> 1.35),
17+
libboost-program-options1.48-dev | libboost-program-options-dev (>> 1.35),
18+
libboost-thread1.48-dev | libboost-thread-dev (>> 1.35),
19+
libboost-test1.48-dev | libboost-test-dev (>> 1.35),
20+
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.35),
2021
qt4-qmake,
2122
libqt4-dev,
2223
libqrencode-dev,
2324
libprotobuf-dev, protobuf-compiler,
2425
python
2526
Standards-Version: 3.9.2
26-
Homepage: https://www.dash.org/
27+
Homepage: https://dash.org/
2728
Vcs-Git: git://github.com/dashpay/dash.git
2829
Vcs-Browser: https://github.com/dashpay/dash
2930

3031
Package: dashd
3132
Architecture: any
3233
Depends: ${shlibs:Depends}, ${misc:Depends}
3334
Description: peer-to-peer network based digital currency - daemon
34-
Dash is an experimental new digital currency that enables instant
35-
payments to anyone, anywhere in the world. Dash uses peer-to-peer
36-
technology to operate with no central authority: managing transactions
37-
and issuing money are carried out collectively by the network. Dash Core
38-
is the name of the open source software which enables the use of this currency.
35+
Dash is a free open source peer-to-peer electronic cash system that
36+
is completely decentralized, without the need for a central server or
37+
trusted parties. Users hold the crypto keys to their own money and
38+
transact directly with each other, with the help of a P2P network to
39+
check for double-spending.
40+
.
41+
Full transaction history is stored locally at each client. This
42+
requires 2+ GB of space, slowly growing.
3943
.
4044
This package provides the daemon, dashd, and the CLI tool
4145
dash-cli to interact with the daemon.
@@ -44,23 +48,26 @@ Package: dash-qt
4448
Architecture: any
4549
Depends: ${shlibs:Depends}, ${misc:Depends}
4650
Description: peer-to-peer network based digital currency - Qt GUI
47-
Dash is an experimental new digital currency that enables instant
48-
payments to anyone, anywhere in the world. Dash uses peer-to-peer
49-
technology to operate with no central authority: managing transactions
50-
and issuing money are carried out collectively by the network. Dash Core
51-
is the name of the open source software which enables the use of this currency.
51+
Dash is a free open source peer-to-peer electronic cash system that
52+
is completely decentralized, without the need for a central server or
53+
trusted parties. Users hold the crypto keys to their own money and
54+
transact directly with each other, with the help of a P2P network to
55+
check for double-spending.
56+
.
57+
Full transaction history is stored locally at each client. This
58+
requires 2+ GB of space, slowly growing.
5259
.
5360
This package provides Dash-Qt, a GUI for Dash based on Qt.
5461

5562
Package: dash-tx
5663
Architecture: any
5764
Depends: ${shlibs:Depends}, ${misc:Depends}
5865
Description: peer-to-peer digital currency - standalone transaction tool
59-
Dash is an experimental new digital currency that enables instant
60-
payments to anyone, anywhere in the world. Dash uses peer-to-peer
61-
technology to operate with no central authority: managing transactions
62-
and issuing money are carried out collectively by the network. Dash Core
63-
is the name of the open source software which enables the use of this currency.
66+
Dash is a free open source peer-to-peer electronic cash system that
67+
is completely decentralized, without the need for a central server or
68+
trusted parties. Users hold the crypto keys to their own money and
69+
transact directly with each other, with the help of a P2P network to
70+
check for double-spending.
6471
.
6572
This package provides dash-tx, a command-line transaction creation
6673
tool which can be used without a dash daemon. Some means of

contrib/debian/manpages/dash-cli.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH BITCOIN-CLI "1" "February 2016" "dash-cli 0.12"
1+
.TH DASH-CLI "1" "June 2016" "dash-cli 0.12"
22
.SH NAME
33
dash-cli \- a remote procedure call client for Dash Core.
44
.SH SYNOPSIS
@@ -14,7 +14,7 @@ This manual page documents the dash-cli program. dash-cli is an RPC client used
1414
Show possible options.
1515

1616
.SH "SEE ALSO"
17-
\fBdash\fP, \fBdash.conf\fP
17+
\fBdashd\fP, \fBdash.conf\fP
1818
.SH AUTHOR
1919
This manual page was written by Ciemon Dunville <[email protected]>. Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License.
2020

contrib/debian/manpages/dash-qt.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH DASH-QT "1" "February 2016" "dash-qt 0.12"
1+
.TH DASH-QT "1" "June 2016" "dash-qt 0.12"
22
.SH NAME
33
dash-qt \- peer-to-peer network based digital currency
44
.SH DESCRIPTION

contrib/debian/manpages/dash.conf.5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH DASH.CONF "5" "February 2016" "dash.conf 0.12"
1+
.TH DASH.CONF "5" "June 2016" "dash.conf 0.12"
22
.SH NAME
33
dash.conf \- dash configuration file
44
.SH SYNOPSIS

contrib/debian/manpages/dashd.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.TH DASHD "1" "February 2016" "dashd 0.12"
1+
.TH DASHD "1" "June 2016" "dashd 0.12"
22
.SH NAME
3-
Dash \- peer-to-peer network based digital currency
3+
dashd \- peer-to-peer network based digital currency
44
.SH SYNOPSIS
5-
dashd [options] <command> [params]
5+
dashd [options] <command> [params]
66
.TP
77
dashd [options] help <command> \- Get help for a command
88
.SH DESCRIPTION

contrib/debian/rules

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# -*- mode: makefile; coding: utf-8 -*-
33

44
#DEB_MAKE_CHECK_TARGET = test_dash
5-
#build/bitcoind::
5+
#build/dashd::
66
# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_dash)
77

8-
DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
9-
DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
8+
DEB_INSTALL_EXAMPLES_dashd += debian/examples/*
9+
DEB_INSTALL_MANPAGES_dashd += debian/manpages/*
1010

1111
%:
1212
dh --with bash-completion $@
@@ -18,7 +18,7 @@ override_dh_auto_clean:
1818
# Yea, autogen should be run on the source archive, but I like doing git archive
1919
override_dh_auto_configure:
2020
./autogen.sh
21-
./configure
21+
./configure --without-miniupnpc --with-gui=qt4
2222

2323
override_dh_auto_test:
2424
make check

contrib/debian/watch

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
version=3
33
# use qa.debian.org redirector; see man uscan
44
opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
5-
http://githubredir.debian.net/github/bitcoin/bitcoin v(.*).tar.gz
5+
http://githubredir.debian.net/github/dashpay/dash v(.*).tar.gz

0 commit comments

Comments
 (0)