Merge lp:~showard314/ubuntu/precise/bitcoin/remove_bitcoin into lp:ubuntu/precise/bitcoin

[Scott Howard]

[Martin Pitt (pitti)]

Sponsored to SRU review queue, thanks!

review: Approve

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2014-05-19 20:25:27 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2014-05-19 20:25:27 +0000
@@ -0,0 +1,1 @@
+series
 
=== modified file 'debian/NEWS'
--- debian/NEWS	2011-05-17 15:31:24 +0000
+++ debian/NEWS	2014-05-19 20:25:27 +0000
@@ -1,3 +1,12 @@
+bitcoin (0.3.24~dfsg-1ubuntu0.2) precise-proposed; urgency=low
+
+  * bitcoin is very out of date and has been removed
+    Please see upstream sources at
+    https://github.com/bitcoin/bitcoin/ or the PPA at
+    https://launchpad.net/~bitcoin/+archive/bitcoin
+
+ -- Scott Howard <[e-mail]>  Mon, 19 May 2014 13:54:10 -0400
+
 bitcoin (0.3.21~dfsg-1) unstable; urgency=low
 
   * Bitcoin is now linked against Berkeley DB 5.1, and from now on
 
=== modified file 'debian/bin/bitcoind'
--- debian/bin/bitcoind	2011-03-16 09:11:06 +0000
+++ debian/bin/bitcoind	2014-05-19 20:25:27 +0000
@@ -1,18 +1,6 @@
 #!/bin/sh
 
-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 "$@"
+
+echo "bitcoin is very out of date and has been removed.
+Please see upstream sources at https://github.com/bitcoin/bitcoin/
+or the PPA at https://launchpad.net/~bitcoin/+archive/bitcoin"
 
=== removed file 'debian/bitcoin-gui.menu'
--- debian/bitcoin-gui.menu	2011-01-17 19:48:35 +0000
+++ debian/bitcoin-gui.menu	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-?package(bitcoin):needs="X11" section="Applications/Utils"\
-  title="Bitcoin" command="/usr/bin/bitcoin"
 
=== removed file 'debian/bitcoind.examples'
--- debian/bitcoind.examples	2011-03-01 15:55:04 +0000
+++ debian/bitcoind.examples	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/examples/bitcoin.conf
 
=== modified file 'debian/bitcoind.install'
--- debian/bitcoind.install	2011-03-01 15:55:04 +0000
+++ debian/bitcoind.install	2014-05-19 20:25:27 +0000
@@ -1,2 +1,1 @@
-debian/bin/bitcoind usr/bin
-src/bitcoind usr/lib/bitcoin
+debian/bin/bitcoind /usr/bin
 
=== removed file 'debian/bitcoind.lintian-overrides'
--- debian/bitcoind.lintian-overrides	2011-03-01 15:55:04 +0000
+++ debian/bitcoind.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Linked code is Expat - only Debian packaging is GPL-2+
-bitcoind: possible-gpl-code-linked-with-openssl
 
=== removed file 'debian/bitcoind.manpages'
--- debian/bitcoind.manpages	2011-03-01 15:55:04 +0000
+++ debian/bitcoind.manpages	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/manpages/bitcoind.1
-debian/manpages/bitcoin.conf.5
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 15:08:54 +0000
+++ debian/changelog	2014-05-19 20:25:27 +0000
@@ -1,3 +1,19 @@
+bitcoin (0.3.24~dfsg-1ubuntu0.2) precise-proposed; urgency=low
+
+  * bitcoin is very out of date and has been removed from Ubuntu
+    Please see upstream sources at
+    https://github.com/bitcoin/bitcoin/ or the PPA at
+    https://launchpad.net/~bitcoin/+archive/bitcoin (LP: #1314616)
+
+ -- Scott Howard <[e-mail]>  Mon, 19 May 2014 13:56:33 -0400
+
+bitcoin (0.3.24~dfsg-1ubuntu0.1) precise-proposed; urgency=low
+
+  * Updates bitcoin wrapper for May 15 mandatory network upgrade
+    (LP: #1159832)
+
+ -- Scott Howard <[e-mail]>  Sun, 28 Apr 2013 20:27:51 -0400
+
 bitcoin (0.3.24~dfsg-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-07-19 15:08:54 +0000
+++ debian/control	2014-05-19 20:25:27 +0000
@@ -1,21 +1,10 @@
 Source: bitcoin
 Section: utils
 Priority: optional
-Maintainer: Jonas Smedegaard <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jonas Smedegaard <[e-mail]>
 Uploaders: Micah Anderson <[e-mail]>
-Build-Depends: cdbs,
- debhelper (>= 6),
- dh-buildinfo,
- libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
- libdb++-dev | libdb4.6++-dev,
- libssl-dev,
- libcrypto++-dev,
- pkg-config,
- libglib2.0-dev,
- libminiupnpc-dev,
- libboost-filesystem-dev (>> 1.35) | libboost-filesystem1.35-dev,
- libboost-program-options-dev (>> 1.35) | libboost-program-options1.35-dev,
- libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev
+Build-Depends: debhelper (>= 6)
 Standards-Version: 3.9.2
 Homepage: http://www.bitcoin.org/
 Vcs-Git: git://git.debian.org/git/collab-maint/bitcoin
 
=== modified file 'debian/control.in'
--- debian/control.in	2011-07-19 15:08:54 +0000
+++ debian/control.in	2014-05-19 20:25:27 +0000
@@ -1,7 +1,8 @@
 Source: bitcoin
 Section: utils
 Priority: optional
-Maintainer: Jonas Smedegaard <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jonas Smedegaard <[e-mail]>
 Uploaders: Micah Anderson <[e-mail]>
 Build-Depends: @cdbs@
 Standards-Version: 3.9.2
 
=== modified file 'debian/rules'
--- debian/rules	2011-07-19 15:08:54 +0000
+++ debian/rules	2014-05-19 20:25:27 +0000
@@ -1,86 +1,9 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2010-2011 Jonas Smedegaard <[e-mail]>
-# Description: Main Debian packaging script for Bitcoin
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
--include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-# suppress optional build-dependencies
-CDBS_BUILD_DEPENDS_rules_upstream-tarball =
-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
-
-DEB_UPSTREAM_URL = http://downloads.sourceforge.net/sourceforge/bitcoin
-DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/~(alpha|beta|rc)/\1/,s/$$/-src/
-DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
-DEB_UPSTREAM_TARBALL_MD5 = 045e1b4efd609c5b502d05488a5393b5
-
-# unneeded external project sources
-DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./src/cryptopp/
-
-# Silence .ico and .mo files in addition to the default debian files
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^src/rc/bitcoin.ico|locale/.*/LC_MESSAGES/.*.mo|debian/(changelog|copyright(|_hints|_newhints))$
-
-DEB_BUILDDIR = src
-
-DEB_MAKE_MAKEFILE = makefile.unix
-
-# Avoid GUI until wxWidget 2.9 is in Debian
-DEB_MAKE_BUILD_TARGET = bitcoind
-
-# Readd default flags
-CXXFLAGS += -D__WXGTK__ -DNOPCH -DUSE_SSL
-#CXXFLAGS += -Wno-invalid-offsetof -Wformat
-
-# Silence seemingly harmless noise about unused variables
-CXXFLAGS += -Wno-unused-variable
-
-# Use optimized miner for amd64 only
-CXXFLAGS += $(if $(filter amd64,$(DEB_HOST_ARCH)),-DFOURWAYSSE2)
-
-DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
-DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
-
-# Apparently any recent boost is ok.  Unversioned Boost in Lenny is too
-# old, however (do not include libboost-system*), so add fallback to
-# ease backporting
-boostver =
-boostoldver = 1.35
-boostdep = $(foreach dep,$1,libboost-$(dep)$(boostver)-dev (>> $(boostoldver)) | libboost-$(dep)$(boostoldver)-dev$(comma) )
-
-CDBS_BUILD_DEPENDS += , $(call boostdep,system), libdb++-dev | libdb4.6++-dev, libssl-dev, libcrypto++-dev, pkg-config, libglib2.0-dev, libminiupnpc-dev
-# TODO: Drop this when maybe system json is used some day
-CDBS_BUILD_DEPENDS += , $(call boostdep,filesystem program-options thread)
-
-# FIXME: when available, enable this and install into -gui package
-#CDBS_BUILD_DEPENDS += , libwxgtk2.9-dev
-
-CDBS_SUGGESTS_bitcoind = db-util, db4.8-util, db4.7-util
-
-# Upstream README contains no parts relevant for Debian usage
-DEB_INSTALL_DOCS_ALL =
-
-pre-build::
-	mkdir -p src/obj/nogui
-clean::
-	find src/obj -type f -not -name .gitignore -delete
-	rm -f src/bitcoind
-
-# Ensure wrapper is set executable
-binary-post-install/bitcoind::
-	chmod +x $(cdbs_curdestdir)usr/bin/bitcoind
+
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+
+override_dh_auto_build: