From 97372c2d22eb81cba403166f99005ea32f4f6608 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 24 Mar 2013 19:40:58 -0400 Subject: Update contrib/debian (including IRC removal) --- contrib/debian/bin/bitcoind | 14 ------------- contrib/debian/bitcoind.install | 3 +-- contrib/debian/changelog | 36 ++++++++++++++++++++++++++++++++++ contrib/debian/control | 4 ---- contrib/debian/examples/bitcoin.conf | 4 ---- contrib/debian/manpages/bitcoin.conf.5 | 3 --- 6 files changed, 37 insertions(+), 27 deletions(-) delete mode 100755 contrib/debian/bin/bitcoind (limited to 'contrib') diff --git a/contrib/debian/bin/bitcoind b/contrib/debian/bin/bitcoind deleted file mode 100755 index a2f55a9138..0000000000 --- a/contrib/debian/bin/bitcoind +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -umask 077 - -basedir=~/.bitcoin -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" - -exec /usr/lib/bitcoin/bitcoind "$@" diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install index e978c44b3f..7bf746006c 100644 --- a/contrib/debian/bitcoind.install +++ b/contrib/debian/bitcoind.install @@ -1,2 +1 @@ -debian/bin/bitcoind usr/bin -src/bitcoind usr/lib/bitcoin +src/bitcoind usr/bin diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 52d0e5907b..4388e7175a 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,39 @@ +bitcoin (0.8.1-natty2) natty; urgency=low + + * Remove dumb broken launcher script + + -- Matt Corallo Sun, 24 Mar 2013 20:01:00 -0400 + +bitcoin (0.8.1-natty1) natty; urgency=low + + * New upstream release. + + -- Matt Corallo Tue, 19 Mar 2013 13:03:00 -0400 + +bitcoin (0.8.0-natty1) natty; urgency=low + + * New upstream release. + + -- Matt Corallo Sat, 23 Feb 2013 16:01:00 -0500 + +bitcoin (0.7.2-natty1) natty; urgency=low + + * New upstream release. + + -- Matt Corallo Sat, 15 Dec 2012 10:59:00 -0400 + +bitcoin (0.7.1-natty1) natty; urgency=low + + * New upstream release. + + -- Matt Corallo Wed, 24 Oct 2012 15:06:00 -0400 + +bitcoin (0.7.0-natty1) natty; urgency=low + + * New upstream release. + + -- Matt Corallo Mon, 17 Sep 2012 13:45:00 +0200 + bitcoin (0.6.3-natty1) natty; urgency=low * New upstream release. diff --git a/contrib/debian/control b/contrib/debian/control index c8266f686b..dd167ef53d 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -33,8 +33,6 @@ Description: peer-to-peer network based digital currency - daemon transact directly with each other, with the help of a P2P network to check for double-spending. . - By default connects to an IRC network to discover other peers. - . Full transaction history is stored locally at each client. This requires 2+ GB of space, slowly growing. . @@ -51,8 +49,6 @@ Description: peer-to-peer network based digital currency - Qt GUI transact directly with each other, with the help of a P2P network to check for double-spending. . - By default connects to an IRC network to discover other peers. - . Full transaction history is stored locally at each client. This requires 2+ GB of space, slowly growing. . diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf index e56c43cb50..10ec36ae7e 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/bitcoin.conf @@ -18,10 +18,6 @@ #connect=69.164.218.197 #connect=10.0.0.1:8333 -# Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to -# find other peers. -#noirc=1 - # Maximum number of inbound+outbound connections. #maxconnections= diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5 index 1243253413..426fe06675 100644 --- a/contrib/debian/manpages/bitcoin.conf.5 +++ b/contrib/debian/manpages/bitcoin.conf.5 @@ -24,9 +24,6 @@ Use as many *addnode=* settings as you like to connect to specific peers. \fBconnect=\fR\fI'10.0.0.1:8333'\fR Use as many *connect=* settings as you like to connect ONLY to specific peers. .TP -\fBnoirc=\fR[\fI'1'\fR|\fI'0'\fR] -Use or Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to find other peers. -.TP \fRmaxconnections=\fR\fI'value'\fR Maximum number of inbound+outbound connections. .SH JSON-RPC OPTIONS -- cgit v1.2.3