From 6e40fcf45575801651ea9598f9bfc24fc342507a Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sat, 26 Apr 2014 20:18:18 -0400 Subject: [PATCH] Update contrib/debian for autotools, among a few other tweaks --- contrib/debian/bitcoin-qt.install | 2 +- contrib/debian/bitcoind.install | 3 ++- contrib/debian/changelog | 13 +++++++++++++ contrib/debian/control | 8 +++++--- contrib/debian/rules | 21 ++++++--------------- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install index 59cacb0e9..e0b32373b 100644 --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,4 +1,4 @@ -bitcoin-qt usr/bin +usr/local/bin/bitcoin-qt usr/bin share/pixmaps/bitcoin32.xpm usr/share/pixmaps share/pixmaps/bitcoin16.xpm usr/share/pixmaps share/pixmaps/bitcoin128.png usr/share/pixmaps diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install index 7bf746006..798ea851f 100644 --- a/contrib/debian/bitcoind.install +++ b/contrib/debian/bitcoind.install @@ -1 +1,2 @@ -src/bitcoind usr/bin +usr/local/bin/bitcoind usr/bin +usr/local/bin/bitcoin-cli usr/bin diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 95b9ad31a..4f22567f8 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,16 @@ +bitcoin (0.9.1-precise1) precise; urgency=medium + + * New upstream release. + * Backport pull #4019 + + -- Matt Corallo Sat, 19 Apr 2014 17:29:00 -0400 + +bitcoin (0.9.0-precise1) precise; urgency=medium + + * New upstream release. + + -- Matt Corallo Thu, 20 Mar 2014 13:10:00 -0400 + bitcoin (0.8.6-precise1) precise; urgency=medium * New upstream release. diff --git a/contrib/debian/control b/contrib/debian/control index dd167ef53..9e006a707 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -5,6 +5,7 @@ Maintainer: Jonas Smedegaard Uploaders: Micah Anderson Build-Depends: debhelper, devscripts, + automake, bash-completion, libboost-system-dev (>> 1.35) | libboost-system1.35-dev, libdb4.8++-dev, @@ -17,7 +18,8 @@ Build-Depends: debhelper, libboost-test-dev (>> 1.35) | libboost-test1.35-dev, qt4-qmake, libqt4-dev, - libqrencode-dev + libqrencode-dev, + libprotobuf-dev, protobuf-compiler Standards-Version: 3.9.2 Homepage: http://www.bitcoin.org/ Vcs-Git: git://github.com/bitcoin/bitcoin.git @@ -34,7 +36,7 @@ Description: peer-to-peer network based digital currency - daemon check for double-spending. . Full transaction history is stored locally at each client. This - requires 2+ GB of space, slowly growing. + requires 20+ GB of space, slowly growing. . This package provides bitcoind, a combined daemon and CLI tool to interact with the daemon. @@ -50,6 +52,6 @@ Description: peer-to-peer network based digital currency - Qt GUI check for double-spending. . Full transaction history is stored locally at each client. This - requires 2+ GB of space, slowly growing. + requires 20+ GB of space, slowly growing. . This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. diff --git a/contrib/debian/rules b/contrib/debian/rules index 98bb2bba1..52b357cf0 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -11,23 +11,14 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* %: dh --with bash-completion $@ -override_dh_auto_build: - cd src; $(MAKE) -f makefile.unix bitcoind - $(MAKE) - override_dh_auto_clean: - if [ -f Makefile ]; then $(MAKE) clean; else rm -rf build/; rm -f bitcoin-qt; fi - cd src; $(MAKE) -f makefile.unix 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: - qmake bitcoin-qt.pro USE_QRCODE=1 + ./autogen.sh + ./configure override_dh_auto_test: - cd src; $(MAKE) -f makefile.unix test_bitcoin - src/test_bitcoin - -# Ensure wrapper is set executable -binary-post-install/bitcoind: - chmod +x $(cdbs_curdestdir)usr/bin/bitcoind -binary-post-install/bitcoin-qt: - chmod +x $(cdbs_curdestdir)usr/bin/bitcoin-qt + make check