diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install index e845a43f7..57eb4df33 100644 --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,6 +1,6 @@ -usr/local/bin/bitcoin-qt usr/bin +usr/bin/bitcoin-qt usr/bin share/pixmaps/bitcoin-abc32.xpm usr/share/pixmaps share/pixmaps/bitcoin-abc16.xpm usr/share/pixmaps share/pixmaps/bitcoin-abc128.png usr/share/pixmaps debian/bitcoin-qt.desktop usr/share/applications debian/bitcoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/bitcoin-tx.install b/contrib/debian/bitcoin-tx.install index 2c21052a6..ffd602aa8 100644 --- a/contrib/debian/bitcoin-tx.install +++ b/contrib/debian/bitcoin-tx.install @@ -1 +1 @@ -usr/local/bin/bitcoin-tx usr/bin +usr/bin/bitcoin-tx usr/bin diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install index 798ea851f..b273e27fa 100644 --- a/contrib/debian/bitcoind.install +++ b/contrib/debian/bitcoind.install @@ -1,2 +1,2 @@ -usr/local/bin/bitcoind usr/bin -usr/local/bin/bitcoin-cli usr/bin +usr/bin/bitcoind usr/bin +usr/bin/bitcoin-cli usr/bin diff --git a/contrib/debian/control b/contrib/debian/control index 17bd73d65..8ee07031f 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,69 +1,68 @@ Source: bitcoinabc Section: utils Priority: optional Maintainer: Bitcoin ABC Package Maintainers Uploaders: Jason B. Cox -Build-Depends: automake, - bash-completion, +Build-Depends: cmake (>= 3.13), debhelper, devscripts, - libtool, + git, libdb5.3++-dev, libevent-dev, - libminiupnpc8-dev | libminiupnpc-dev (>> 1.6), - libboost-filesystem-dev (>> 1.58) | libboost-filesystem1.58-dev, - libboost-chrono-dev (>> 1.58) | libboost-chrono1.58-dev, - libboost-system-dev (>> 1.58) | libboost-system1.58-dev, - libboost-thread-dev (>> 1.58) | libboost-thread1.58-dev, - libboost-test-dev (>> 1.58) | libboost-test1.58-dev, - libprotobuf-dev, protobuf-compiler, + libminiupnpc-dev, + libboost-filesystem-dev, + libboost-chrono-dev, + libboost-system-dev, + libboost-thread-dev, + libboost-test-dev, + libprotobuf-dev, libqrencode-dev, libssl-dev, libzmq3-dev, - pkg-config, + protobuf-compiler, python3, qttools5-dev, qttools5-dev-tools Standards-Version: 3.9.2 Homepage: https://bitcoinabc.org/ Vcs-Git: ssh://vcs@reviews.bitcoinabc.org:2221/source/bitcoin-abc.git Vcs-Browser: https://reviews.bitcoinabc.org/source/bitcoin-abc/ Package: bitcoind Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon Bitcoin is an experimental new digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin ABC is the name of the open source software which enables the use of this currency. . This package provides the daemon, bitcoind, and the CLI tool bitcoin-cli to interact with the daemon. Package: bitcoin-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI Bitcoin is an experimental new digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin ABC is the name of the open source software which enables the use of this currency. . This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. Package: bitcoin-tx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer digital currency - standalone transaction tool Bitcoin is an experimental new digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin ABC is the name of the open source software which enables the use of this currency. . This package provides bitcoin-tx, a command-line transaction creation tool which can be used without a bitcoin daemon. Some means of exchanging minimal transaction data with peers is still required. diff --git a/contrib/debian/rules b/contrib/debian/rules index 76b69f732..e6a5a0da4 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,21 +1,5 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -#DEB_MAKE_CHECK_TARGET = test_bitcoin -#build/bitcoind:: -# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_bitcoin) - %: - dh $@ --with bash-completion - -override_dh_auto_clean: - if [ -f Makefile ]; then $(MAKE) distclean; fi - 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 - -# Yea, autogen should be run on the source archive, but I like doing git archive -override_dh_auto_configure: - ./autogen.sh - ./configure - -override_dh_auto_test: - make check + dh $@ --buildsystem=cmake