diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install index 57eb4df33..a738c964c 100644 --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,6 +1,6 @@ -usr/bin/bitcoin-qt usr/bin +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-qt.manpages b/contrib/debian/bitcoin-qt.manpages index 9a3cc31c0..3fe0eab0d 100644 --- a/contrib/debian/bitcoin-qt.manpages +++ b/contrib/debian/bitcoin-qt.manpages @@ -1 +1 @@ -doc/man/bitcoin-qt.1 +share/man/man1/bitcoin-qt.1 diff --git a/contrib/debian/bitcoin-tx.install b/contrib/debian/bitcoin-tx.install index ffd602aa8..1a1fcecb6 100644 --- a/contrib/debian/bitcoin-tx.install +++ b/contrib/debian/bitcoin-tx.install @@ -1 +1 @@ -usr/bin/bitcoin-tx usr/bin +bin/bitcoin-tx usr/bin diff --git a/contrib/debian/bitcoin-tx.manpages b/contrib/debian/bitcoin-tx.manpages index 861d49d07..1d5af9bb0 100644 --- a/contrib/debian/bitcoin-tx.manpages +++ b/contrib/debian/bitcoin-tx.manpages @@ -1 +1 @@ -doc/man/bitcoin-tx.1 +share/man/man1/bitcoin-tx.1 diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install index b273e27fa..845906480 100644 --- a/contrib/debian/bitcoind.install +++ b/contrib/debian/bitcoind.install @@ -1,2 +1,2 @@ -usr/bin/bitcoind usr/bin -usr/bin/bitcoin-cli usr/bin +bin/bitcoind usr/bin +bin/bitcoin-cli usr/bin diff --git a/contrib/debian/bitcoind.manpages b/contrib/debian/bitcoind.manpages index bab644ece..e0eca7be4 100644 --- a/contrib/debian/bitcoind.manpages +++ b/contrib/debian/bitcoind.manpages @@ -1,2 +1,2 @@ -doc/man/bitcoind.1 -doc/man/bitcoin-cli.1 +share/man/man1/bitcoind.1 +share/man/man1/bitcoin-cli.1 diff --git a/contrib/debian/control b/contrib/debian/control index a12bf08dd..a8d180a5b 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -1,70 +1,72 @@ Source: bitcoinabc Section: utils Priority: optional Maintainer: Bitcoin ABC Package Maintainers Uploaders: Jason B. Cox Build-Depends: cmake (>= 3.16), debhelper (>=12.1), devscripts, git, + help2man, libdb5.3++-dev, libevent-dev, libjemalloc-dev, 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, ninja-build, protobuf-compiler, python3, qttools5-dev, - qttools5-dev-tools + qttools5-dev-tools, + xvfb 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 1d468158f..447eeaa4e 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,11 +1,15 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- %: dh $@ --buildsystem=cmake+ninja --builddirectory=_build override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_JEMALLOC=OFF + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$$(pwd)/debian/tmp -DUSE_JEMALLOC=OFF override_dh_auto_test: ninja -C _build check + +override_dh_auto_install: + ninja -C _build install/strip + DESTDIR= xvfb-run ninja -C _build install-manpages