diff options
Diffstat (limited to 'contrib/debian')
| -rwxr-xr-x | contrib/debian/bin/bitcoin-qt | 16 | ||||
| -rwxr-xr-x | contrib/debian/bin/bitcoind | 4 | ||||
| -rw-r--r-- | contrib/debian/bitcoin-qt.install | 3 | ||||
| -rw-r--r-- | contrib/debian/bitcoind.bash-completion | 1 | ||||
| -rw-r--r-- | contrib/debian/changelog | 56 | ||||
| -rw-r--r-- | contrib/debian/control | 1 | ||||
| -rw-r--r-- | contrib/debian/patches/1001_use_system_json-spirit.patch | 63 | ||||
| -rw-r--r-- | contrib/debian/patches/series | 2 | ||||
| -rwxr-xr-x | contrib/debian/rules | 2 |
9 files changed, 57 insertions, 91 deletions
diff --git a/contrib/debian/bin/bitcoin-qt b/contrib/debian/bin/bitcoin-qt deleted file mode 100755 index f2eac1b1ab..0000000000 --- a/contrib/debian/bin/bitcoin-qt +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -umask 077 - -basedir=~/.bitcoin -dbfile="$basedir/DB_CONFIG" -cfgfile="$basedir/bitcoin.conf" - -[ -e "$basedir" ] || mkdir "$basedir" - -# Bitcoin does not clean up DB log files by default -[ -e "$dbfile" ] || echo 'set_flags DB_LOG_AUTOREMOVE' > "$dbfile" - -exec /usr/lib/bitcoin/bitcoin-qt "$@" diff --git a/contrib/debian/bin/bitcoind b/contrib/debian/bin/bitcoind index 0904f76f7b..a2f55a9138 100755 --- a/contrib/debian/bin/bitcoind +++ b/contrib/debian/bin/bitcoind @@ -5,14 +5,10 @@ set -e umask 077 basedir=~/.bitcoin -dbfile="$basedir/DB_CONFIG" cfgfile="$basedir/bitcoin.conf" [ -e "$basedir" ] || mkdir "$basedir" [ -e "$cfgfile" ] || perl -le 'print"rpcpassword=",map{(a..z,A..Z,0..9)[rand 62]}0..9' > "$cfgfile" -# Bitcoin does not clean up DB log files by default -[ -e "$dbfile" ] || echo 'set_flags DB_LOG_AUTOREMOVE' > "$dbfile" - exec /usr/lib/bitcoin/bitcoind "$@" diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install index 6a566f515a..ba407134e7 100644 --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,5 +1,4 @@ -debian/bin/bitcoin-qt usr/bin -bitcoin-qt usr/lib/bitcoin +bitcoin-qt usr/bin share/pixmaps/bitcoin32.xpm usr/share/pixmaps share/pixmaps/bitcoin80.xpm usr/share/pixmaps debian/bitcoin-qt.desktop usr/share/applications diff --git a/contrib/debian/bitcoind.bash-completion b/contrib/debian/bitcoind.bash-completion new file mode 100644 index 0000000000..0f84707b66 --- /dev/null +++ b/contrib/debian/bitcoind.bash-completion @@ -0,0 +1 @@ +contrib/bitcoind.bash-completion bitcoind diff --git a/contrib/debian/changelog b/contrib/debian/changelog index db5e2682c6..52d0e5907b 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,13 +1,61 @@ -bitcoin (0.5.1-natty1) natty; urgency=low +bitcoin (0.6.3-natty1) natty; urgency=low + + * New upstream release. + + -- Matt Corallo <matt@bluematt.me> Mon, 25 Jun 2012 23:47:00 +0200 + +bitcoin (0.6.2-natty1) natty; urgency=low + + * Update package description and launch scripts. + + -- Matt Corallo <matt@bluematt.me> Sat, 2 Jun 2012 16:41:00 +0200 + +bitcoin (0.6.2-natty0) natty; urgency=low + + * New upstream release. + + -- Matt Corallo <matt@bluematt.me> Tue, 8 May 2012 16:27:00 -0500 + +bitcoin (0.6.1-natty0) natty; urgency=low + + * New upstream release. + + -- Matt Corallo <matt@bluematt.me> Sun, 6 May 2012 20:09:00 -0500 + +bitcoin (0.6.0-natty0) natty; urgency=low + + * New upstream release. + * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support. + Thanks to luke-jr for the KDE .protocol file. + + -- Matt Corallo <matt@bluematt.me> Sat, 31 Mar 2012 15:35:00 -0500 + +bitcoin (0.5.3-natty1) natty; urgency=low + + * Mark for upload to PPA. + + -- Matt Corallo <matt@bluematt.me> Wed, 14 Mar 2012 23:06:00 -0400 + +bitcoin (0.5.3-natty0) natty; urgency=low + + * New upstream release. + + -- Luke Dashjr <luke+bitcoin+deb@dashjr.org> Tue, 10 Jan 2012 15:57:00 -0500 + +bitcoin (0.5.2-natty1) natty; urgency=low * Remove mentions on anonymity in package descriptions and manpage. These should never have been there, bitcoin isnt anonymous without a ton of work that virtually no users will ever be willing and capable of doing - * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support. - Thanks to luke-jr for the KDE .protocol file. - -- Matt Corallo <matt@bluematt.me> Fri, 23 Dec 2011 20:25:00 -0500 + -- Matt Corallo <matt@bluematt.me> Sat, 7 Jan 2012 13:37:00 -0500 + +bitcoin (0.5.2-natty0) natty; urgency=low + + * New upstream release. + + -- Luke Dashjr <luke+bitcoin+deb@dashjr.org> Fri, 16 Dec 2011 17:57:00 -0500 bitcoin (0.5.1-natty0) natty; urgency=low diff --git a/contrib/debian/control b/contrib/debian/control index d0a2d57c9e..c8266f686b 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -5,6 +5,7 @@ Maintainer: Jonas Smedegaard <dr@jones.dk> Uploaders: Micah Anderson <micah@debian.org> Build-Depends: debhelper, devscripts, + bash-completion, libboost-system-dev (>> 1.35) | libboost-system1.35-dev, libdb4.8++-dev, libssl-dev, diff --git a/contrib/debian/patches/1001_use_system_json-spirit.patch b/contrib/debian/patches/1001_use_system_json-spirit.patch deleted file mode 100644 index c6d60393d4..0000000000 --- a/contrib/debian/patches/1001_use_system_json-spirit.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Use system JSON Spirit library -Author: Jonas Smedegaard <dr@jones.dk> -Last-Update: 2012-07-05 ---- a/src/bitcoinrpc.h -+++ b/src/bitcoinrpc.h -@@ -9,9 +9,7 @@ - #include <string> - #include <map> - --#include "json/json_spirit_reader_template.h" --#include "json/json_spirit_writer_template.h" --#include "json/json_spirit_utils.h" -+#include <json_spirit.h> - - void ThreadRPCServer(void* parg); - int CommandLineRPC(int argc, char *argv[]); ---- a/src/makefile.unix -+++ b/src/makefile.unix -@@ -31,6 +31,7 @@ LIBS += \ - -l boost_thread$(BOOST_LIB_SUFFIX) \ - -l db_cxx$(BDB_LIB_SUFFIX) \ - -l ssl \ -+ -l json_spirit \ - -l crypto - - ifndef USE_UPNP ---- a/src/rpcdump.cpp -+++ b/src/rpcdump.cpp -@@ -8,9 +8,7 @@ - - #include <boost/lexical_cast.hpp> - --#include "json/json_spirit_reader_template.h" --#include "json/json_spirit_writer_template.h" --#include "json/json_spirit_utils.h" -+#include <json_spirit.h> - - #define printf OutputDebugStringF - ---- a/src/test/rpc_tests.cpp -+++ b/src/test/rpc_tests.cpp -@@ -1,6 +1,8 @@ - #include <boost/test/unit_test.hpp> - #include <boost/foreach.hpp> - -+#include <json_spirit.h> -+ - #include "base58.h" - #include "util.h" - #include "bitcoinrpc.h" ---- a/src/test/script_tests.cpp -+++ b/src/test/script_tests.cpp -@@ -8,9 +8,7 @@ - #include <boost/foreach.hpp> - #include <boost/preprocessor/stringize.hpp> - #include <boost/test/unit_test.hpp> --#include "json/json_spirit_reader_template.h" --#include "json/json_spirit_writer_template.h" --#include "json/json_spirit_utils.h" -+#include <json_spirit.h> - - #include "main.h" - #include "wallet.h" diff --git a/contrib/debian/patches/series b/contrib/debian/patches/series index bbe3685ac2..8b13789179 100644 --- a/contrib/debian/patches/series +++ b/contrib/debian/patches/series @@ -1 +1 @@ -#1001_use_system_json-spirit.patch + diff --git a/contrib/debian/rules b/contrib/debian/rules index 49c7766d13..98bb2bba1c 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -9,7 +9,7 @@ DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/* DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* %: - dh $@ + dh --with bash-completion $@ override_dh_auto_build: cd src; $(MAKE) -f makefile.unix bitcoind |