diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,4 +1,4 @@ -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 diff --git a/contrib/debian/bitcoin-qt.manpages b/contrib/debian/bitcoin-qt.manpages --- 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 --- 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 --- 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 --- 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 --- 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 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -7,6 +7,7 @@ debhelper (>=12.1), devscripts, git, + help2man, libdb5.3++-dev, libevent-dev, libjemalloc-dev, @@ -24,7 +25,8 @@ 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 diff --git a/contrib/debian/rules b/contrib/debian/rules --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -5,7 +5,11 @@ 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