Merge pull request #1411 from TheBlueMatt/debian

Update contrib/debian.
13 years ago · 9f46a3e32a
5 changed files with 15 additions and 24 deletions
--- a/contrib/debian/bin/bitcoin-qt
+++ b/contrib/debian/bin/bitcoin-qt
@ -1,16 +0,0 @@
				@@ -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 "$@"
--- a/contrib/debian/bin/bitcoind
+++ b/contrib/debian/bin/bitcoind
@ -5,14 +5,10 @@ set -e
				@@ -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 "$@"
--- a/contrib/debian/bitcoin-qt.install
+++ b/contrib/debian/bitcoin-qt.install
@ -1,5 +1,4 @@
				@@ -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
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@ -1,3 +1,15 @@
				@@ -1,3 +1,15 @@
+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.
--- a/contrib/debian/control
+++ b/contrib/debian/control
@ -36,7 +36,7 @@ Description: peer-to-peer network based digital currency - daemon
				@@ -36,7 +36,7 @@ Description: peer-to-peer network based digital currency - daemon
 By default connects to an IRC network to discover other peers.
 .
 Full transaction history is stored locally at each client.  This
- requires 150+ MB of space, slowly growing.
+ requires 2+ GB of space, slowly growing.
 .
 This package provides bitcoind, a combined daemon and CLI tool to
 interact with the daemon.
@ -54,6 +54,6 @@ Description: peer-to-peer network based digital currency - QT GUI
				@@ -54,6 +54,6 @@ Description: peer-to-peer network based digital currency - QT GUI
 By default connects to an IRC network to discover other peers.
 .
 Full transaction history is stored locally at each client.  This
- requires 150+ MB of space, slowly growing.
+ requires 2+ GB of space, slowly growing.
 .
 This package provides bitcoin-qt, a GUI for Bitcoin based on QT.