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

Enable PPA builds #896

merged 6 commits into from
Jun 30, 2016

Conversation

schinzelh
Copy link

Closes #880

- 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
@@ -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 :)

@schinzelh
Copy link
Author

schinzelh commented Jun 30, 2016

Btw, this is just for documentation purposes, Bitcoin is not even maintaining their contrib/debian folder anymore, maybe i should open a PR at Bitcoin as well :)

@schinzelh
Copy link
Author

Pushed 7ad1ea8

@schinzelh
Copy link
Author

Pushed 05e0a12

- bitcoin*.png to dash*.png
- bitcoin*.xpm to dash*.xpm
@schinzelh
Copy link
Author

Pushed da7ef9c - rename the missing bitcoin*.png and bitcoin*.xpm to their dash counterparts

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 :)

@schinzelh
Copy link
Author

Pushed d0d2f05

@schinzelh
Copy link
Author

Pushed 3dc2bab

@UdjinM6
Copy link

UdjinM6 commented Jun 30, 2016

utACK 3dc2bab

Hope it actually works ;)

@schinzelh schinzelh merged commit 9c302a7 into v0.12.1.x Jun 30, 2016
@schinzelh schinzelh deleted the enable_ppa branch June 30, 2016 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants