Update contrib/debian (including IRC removal)

12 years ago · 97372c2d22
6 changed files with 37 additions and 27 deletions
--- a/contrib/debian/bin/bitcoind
+++ b/contrib/debian/bin/bitcoind
@ -1,14 +0,0 @@
				@@ -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 "$@"
--- a/contrib/debian/bitcoind.install
+++ b/contrib/debian/bitcoind.install
@ -1,2 +1 @@
				@@ -1,2 +1 @@
-debian/bin/bitcoind usr/bin
-src/bitcoind usr/lib/bitcoin
+src/bitcoind usr/bin
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@ -1,3 +1,39 @@
				@@ -1,3 +1,39 @@
+bitcoin (0.8.1-natty2) natty; urgency=low
+
+  * Remove dumb broken launcher script
+
+ -- Matt Corallo <matt@bluematt.me>  Sun, 24 Mar 2013 20:01:00 -0400
+
+bitcoin (0.8.1-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me>  Tue, 19 Mar 2013 13:03:00 -0400
+
+bitcoin (0.8.0-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me>  Sat, 23 Feb 2013 16:01:00 -0500
+
+bitcoin (0.7.2-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me>  Sat, 15 Dec 2012 10:59:00 -0400
+
+bitcoin (0.7.1-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me>  Wed, 24 Oct 2012 15:06:00 -0400
+
+bitcoin (0.7.0-natty1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Matt Corallo <matt@bluematt.me>  Mon, 17 Sep 2012 13:45:00 +0200
+
 bitcoin (0.6.3-natty1) natty; urgency=low

  * New upstream release.
--- a/contrib/debian/control
+++ b/contrib/debian/control
@ -33,8 +33,6 @@ Description: peer-to-peer network based digital currency - daemon
				@@ -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
				@@ -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.
 .
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@ -18,10 +18,6 @@
				@@ -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=

--- 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.
				@@ -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