Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable PPA builds #896

Merged
merged 6 commits into from
Jun 30, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/debian/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, if we want to avoid conflicts with bitcoin packages imo it's time to fix bitcoin->dash for pixmaps https://github.com/dashpay/dash/tree/master/share/pixmaps (and references to them)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is out of scope of this PR - i just wanted it to be accurate (and reflect the current state) :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errr... I'm not sure if it makes sense to enable ppa builds which will conflict with some existing one... how about fixing /contrib/debian/dash-qt.install instead (at least that's the only reference I found) and renaming bitcoin128.png to dash128.png?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually there are 2 more files referenced in /contrib/debian/dash-qt.install - bitcoin32.xpm and bitcoin16.xpm and I can't find any more references to them so renaming all 3 of them shouldn't break anything else imo

Copy link
Author

@schinzelh schinzelh Jun 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okok :) So we'll rename all bitcoin*.* files in share/pixmap and their references?

image

edit: n/m, saw your post re. 3 references to late :)

Copy link

@UdjinM6 UdjinM6 Jun 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, will require to fix winfows packaging too though because of bitcoin.ico (Makefile.am and setup.nsi.in)... or let's start with bitcoin*.png and bitcoin*.xpm for debian packaging only changes :)


dash-qt.protocol (KDE)

72 changes: 67 additions & 5 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,65 @@
bitcoin (0.12.1-trusty1) trusty; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <[email protected]> Mon, 18 Apr 2016 14:26:00 -0700

bitcoin (0.12.0-trusty6) trusty; urgency=medium

* Fix program-options dep.

-- Matt Corallo (BlueMatt) <[email protected]> Fri, 25 Mar 2016 21:41:00 -0700

bitcoin (0.12.0-trusty5) trusty; urgency=medium

* Test explicit --with-gui

-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 23:25:00 -0800

bitcoin (0.12.0-trusty4) trusty; urgency=medium

* Fix libevent-dev dep.

-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 23:25:00 -0800

bitcoin (0.12.0-trusty3) trusty; urgency=medium

* Fix precise boost dep.

-- Matt Corallo (BlueMatt) <[email protected]> Tue, 23 Feb 2015 19:55:00 -0800

bitcoin (0.12.0-trusty2) trusty; urgency=medium

* Fix libevent dep.

-- Matt Corallo (BlueMatt) <[email protected]> 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) <[email protected]> Tue, 23 Feb 2015 19:29:00 -0800

bitcoin (0.11.2-trusty1) trusty; urgency=low

* New upstream release.

-- Matt Corallo (BlueMatt) <[email protected]> Fri, 13 Nov 2015 18:39:00 -0800

bitcoin (0.11.1-trusty2) trusty; urgency=low

* Remove minupnpc builddep.

-- Matt Corallo (BlueMatt) <[email protected]> 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) <[email protected]> Wed, 14 Oct 2015 13:57:00 -1000

bitcoin (0.11.0-precise1) precise; urgency=medium

* New upstream release.
Expand Down Expand Up @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes starting from this line look more like a rollback, bringing errors/misspellings...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, it's a rollback - you don't change changelogs afterwards

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, ok, good point :)

a ton of work that virtually no users will ever be willing and
capable of doing

Expand Down Expand Up @@ -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 <[email protected]> Wed, 26 Oct 2011 14:37:18 -0400

Expand Down Expand Up @@ -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,
Expand All @@ -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:
Expand Down
55 changes: 31 additions & 24 deletions contrib/debian/control
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
Source: dash
Section: utils
Priority: optional
Maintainer: Jonas Smedegaard <[email protected]> ***TODO***
Uploaders: Micah Anderson <micah@debian.org> ***TODO***
Maintainer: Holger Schinzel <[email protected]>
Uploaders: Holger Schinzel <holger@dash.org>
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

Package: dashd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: peer-to-peer network based digital currency - daemon
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again - more like a rollback

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer dash.org instead of www.dash.org :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, that's questionable :) because dash.org redirects to www.dash.org as an actual Homepage and dash.org is also used for a bunch of other things like forum., explorer. etc

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, convinced, will push a change :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also description below

Dash is ...

was matching readme and a newly proposed version doesn't. I like readme version more then a newly proposed one, imo current one is more accurate, no need to change it.

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
Copy link

@UdjinM6 UdjinM6 Jun 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I probably commented on a wrong line previously, so rephrasing here...
This description was matching readme and a newly proposed version doesn't. I like "readme" version more then a newly proposed one, imo current one is more accurate, no need to change it. Also I'm not sure where is new one came from - both 12.0 and 12.1 have same ("readme") version, not the new one.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea either. The one committed now is from Bitcoin 12.1 with Bitcoin replaced by Dash :)

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.
Expand All @@ -44,23 +48,26 @@ 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.

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
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/manpages/dash-cli.1
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 <[email protected]>. Permission is granted to copy, distribute and/or modify this document under the terms of the MIT License.

Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/manpages/dash-qt.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/manpages/dash.conf.5
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions contrib/debian/manpages/dashd.1
Original file line number Diff line number Diff line change
@@ -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] <command> [params]
dashd [options] <command> [params]
Copy link

@UdjinM6 UdjinM6 Jun 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: trailing space

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed

.TP
dashd [options] help <command> \- Get help for a command
.SH DESCRIPTION
Expand Down
8 changes: 4 additions & 4 deletions contrib/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand All @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--without-miniupnpc makes connectivity significantly worse for those who are behind routers afaik, is there a reason to configure like this? also why qt4?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what Bitcoin is doing - i guess for compatibilty with 5 different Ubuntu versions...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, ok

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to test it on all 5 versions anyway, if something does not work out we'll adapt

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re. miniupnp: As far as i know Bitcoin disabled it because of security concerns


override_dh_auto_test:
make check
2 changes: 1 addition & 1 deletion contrib/debian/watch
Original file line number Diff line number Diff line change
Expand Up @@ -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