Sync contrib/debian from Matt Corallo's PPA
This commit is contained in:
ctp-tsteenholdt
parent
615f7c2884
commit
9085532d35
6 changed files with 102 additions and 6 deletions
|
|
@ -1,5 +1,5 @@
|
|||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Encoding=UTF-8
|
||||
Name=Bitcoin Core
|
||||
Comment=Connect to the Bitcoin P2P Network
|
||||
Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
|
||||
|
|
@ -11,4 +11,3 @@ Type=Application
|
|||
Icon=bitcoin128
|
||||
MimeType=x-scheme-handler/bitcoin;
|
||||
Categories=Office;Finance;P2P;Network;Qt;
|
||||
StartupWMClass=Bitcoin-qt
|
||||
|
|
|
|||
|
|
@ -1,3 +1,89 @@
|
|||
bitcoin (0.16.0-xenial1) xenial; urgency=medium
|
||||
|
||||
* Mark for xenial.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 05 Mar 2018 11:20:00 -0500
|
||||
|
||||
bitcoin (0.16.0-trusty1) trusty; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 05 Mar 2018 11:18:00 -0500
|
||||
|
||||
bitcoin (0.15.1-trusty1) trusty; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
* Remove backported patches (which are now upstream).
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Sat, 11 Nov 2017 16:51:00 -0500
|
||||
|
||||
bitcoin (0.15.0-artful9) artful; urgency=medium
|
||||
|
||||
* Mark for artful.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Sat, 21 Oct 2017 20:56:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty9) trusty; urgency=medium
|
||||
|
||||
* Add missing xvfb dep.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 14 Sep 2017 22:47:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty8) trusty; urgency=medium
|
||||
|
||||
* Backport #11332 to fix Qt settings upgrade segfault.
|
||||
* Use qt5 on arm to fix Qt test segfault.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 14 Sep 2017 22:03:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty7) trusty; urgency=medium
|
||||
|
||||
* Backport #11210 to fix build inside launchpad.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 12 Sep 2017 16:13:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty6) trusty; urgency=medium
|
||||
|
||||
* Make launchpad print more debug information.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 12 Sep 2017 12:50:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty5) trusty; urgency=medium
|
||||
|
||||
* Use proper makefile comparison to fix Xvfb start.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 12 Sep 2017 12:49:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty4) trusty; urgency=medium
|
||||
|
||||
* Use full path for start-stop-daemon to fix Xvfb start.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 12 Sep 2017 11:44:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty3) trusty; urgency=medium
|
||||
|
||||
* Fix DISPLAY setting when using xvfb.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 11 Sep 2017 20:06:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty2) trusty; urgency=medium
|
||||
|
||||
* Use xvfb to run qt4 tests.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 11 Sep 2017 17:31:00 -0400
|
||||
|
||||
bitcoin (0.15.0-trusty1) trusty; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 11 Sep 2017 16:17:00 -0400
|
||||
|
||||
bitcoin (0.14.2-trusty1) trusty; urgency=medium
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 23 Jun 2017 18:21:00 -0400
|
||||
|
||||
bitcoin (0.14.1-trusty4) trusty; urgency=medium
|
||||
|
||||
* Re-enable UPnP support.
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ Build-Depends: debhelper,
|
|||
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.47),
|
||||
libminiupnpc8-dev | libminiupnpc-dev,
|
||||
qt4-qmake, libqt4-dev,
|
||||
xvfb,
|
||||
qttools5-dev-tools, qttools5-dev,
|
||||
libqrencode-dev,
|
||||
libprotobuf-dev, protobuf-compiler,
|
||||
|
|
|
|||
|
|
@ -76,10 +76,10 @@
|
|||
#rpcuser=Ulysseys
|
||||
#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
|
||||
#
|
||||
# The second method `rpcauth` can be added to server startup argument. It is set at initialization time
|
||||
# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
|
||||
# The second method `rpcauth` can be added to server startup argument. It is set at intialization time
|
||||
# using the output from the script in share/rpcuser/rpcuser.py after providing a username:
|
||||
#
|
||||
# ./share/rpcauth/rpcauth.py alice
|
||||
# ./share/rpcuser/rpcuser.py alice
|
||||
# String to be appended to bitcoin.conf:
|
||||
# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
|
||||
# Your password:
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
|
||||
|
|
@ -13,6 +13,13 @@ override_dh_auto_clean:
|
|||
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
|
||||
|
||||
QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
|
||||
# qt4 is very broken on arm
|
||||
ifeq ($(findstring arm,$(shell uname -m)),arm)
|
||||
QT=qt5
|
||||
endif
|
||||
ifeq ($(findstring aarch64,$(shell uname -m)),aarch64)
|
||||
QT=qt5
|
||||
endif
|
||||
|
||||
# Yea, autogen should be run on the source archive, but I like doing git archive
|
||||
override_dh_auto_configure:
|
||||
|
|
@ -20,4 +27,8 @@ override_dh_auto_configure:
|
|||
./configure --with-gui=$(QT)
|
||||
|
||||
override_dh_auto_test:
|
||||
ifeq ($(QT), qt4)
|
||||
xvfb-run -n 99 -l make check
|
||||
else
|
||||
make check
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue