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

Proposed by Scott Howard on 2014-05-19
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~showard314/ubuntu/precise/bitcoin/remove_bitcoin
Merge into: lp:ubuntu/precise/bitcoin
Diff against target: 256 lines (+45/-125)
13 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
debian/NEWS (+9/-0)
debian/bin/bitcoind (+4/-16)
debian/bitcoin-gui.menu (+0/-2)
debian/bitcoind.examples (+0/-1)
debian/bitcoind.install (+1/-2)
debian/bitcoind.lintian-overrides (+0/-2)
debian/bitcoind.manpages (+0/-2)
debian/changelog (+16/-0)
debian/control (+3/-14)
debian/control.in (+2/-1)
debian/rules (+8/-85)
To merge this branch: bzr merge lp:~showard314/ubuntu/precise/bitcoin/remove_bitcoin
Reviewer Review Type Date Requested Status
Martin Pitt 2014-05-19 Approve on 2014-08-01
Review via email: mp+220127@code.launchpad.net
To post a comment you must log in.
Martin Pitt (pitti) wrote :

Sponsored to SRU review queue, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1debian/patches
02
=== 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 @@
1series
02
=== 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 @@
1bitcoin (0.3.24~dfsg-1ubuntu0.2) precise-proposed; urgency=low
2
3 * bitcoin is very out of date and has been removed
4 Please see upstream sources at
5 https://github.com/bitcoin/bitcoin/ or the PPA at
6 https://launchpad.net/~bitcoin/+archive/bitcoin
7
8 -- Scott Howard <showard@debian.org> Mon, 19 May 2014 13:54:10 -0400
9
1bitcoin (0.3.21~dfsg-1) unstable; urgency=low10bitcoin (0.3.21~dfsg-1) unstable; urgency=low
211
3 * Bitcoin is now linked against Berkeley DB 5.1, and from now on12 * Bitcoin is now linked against Berkeley DB 5.1, and from now on
413
=== 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 @@
1#!/bin/sh1#!/bin/sh
22
3set -e3
44echo "bitcoin is very out of date and has been removed.
5umask 0775Please see upstream sources at https://github.com/bitcoin/bitcoin/
66or the PPA at https://launchpad.net/~bitcoin/+archive/bitcoin"
7basedir=~/.bitcoin
8dbfile="$basedir/DB_CONFIG"
9cfgfile="$basedir/bitcoin.conf"
10
11[ -e "$basedir" ] || mkdir "$basedir"
12
13[ -e "$cfgfile" ] || perl -le 'print"rpcpassword=",map{(a..z,A..Z,0..9)[rand 62]}0..9' > "$cfgfile"
14
15# Bitcoin does not clean up DB log files by default
16[ -e "$dbfile" ] || echo 'set_flags DB_LOG_AUTOREMOVE' > "$dbfile"
17
18exec /usr/lib/bitcoin/bitcoind "$@"
197
=== 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 @@
1?package(bitcoin):needs="X11" section="Applications/Utils"\
2 title="Bitcoin" command="/usr/bin/bitcoin"
30
=== 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 @@
1debian/examples/bitcoin.conf
20
=== 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 @@
1debian/bin/bitcoind usr/bin1debian/bin/bitcoind /usr/bin
2src/bitcoind usr/lib/bitcoin
32
=== 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 @@
1# Linked code is Expat - only Debian packaging is GPL-2+
2bitcoind: possible-gpl-code-linked-with-openssl
30
=== 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 @@
1debian/manpages/bitcoind.1
2debian/manpages/bitcoin.conf.5
30
=== 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 @@
1bitcoin (0.3.24~dfsg-1ubuntu0.2) precise-proposed; urgency=low
2
3 * bitcoin is very out of date and has been removed from Ubuntu
4 Please see upstream sources at
5 https://github.com/bitcoin/bitcoin/ or the PPA at
6 https://launchpad.net/~bitcoin/+archive/bitcoin (LP: #1314616)
7
8 -- Scott Howard <showard@debian.org> Mon, 19 May 2014 13:56:33 -0400
9
10bitcoin (0.3.24~dfsg-1ubuntu0.1) precise-proposed; urgency=low
11
12 * Updates bitcoin wrapper for May 15 mandatory network upgrade
13 (LP: #1159832)
14
15 -- Scott Howard <showard@debian.org> Sun, 28 Apr 2013 20:27:51 -0400
16
1bitcoin (0.3.24~dfsg-1) unstable; urgency=low17bitcoin (0.3.24~dfsg-1) unstable; urgency=low
218
3 * New upstream release.19 * New upstream release.
420
=== 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 @@
1Source: bitcoin1Source: bitcoin
2Section: utils2Section: utils
3Priority: optional3Priority: optional
4Maintainer: Jonas Smedegaard <dr@jones.dk>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
5Uploaders: Micah Anderson <micah@debian.org>6Uploaders: Micah Anderson <micah@debian.org>
6Build-Depends: cdbs,7Build-Depends: debhelper (>= 6)
7 debhelper (>= 6),
8 dh-buildinfo,
9 libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
10 libdb++-dev | libdb4.6++-dev,
11 libssl-dev,
12 libcrypto++-dev,
13 pkg-config,
14 libglib2.0-dev,
15 libminiupnpc-dev,
16 libboost-filesystem-dev (>> 1.35) | libboost-filesystem1.35-dev,
17 libboost-program-options-dev (>> 1.35) | libboost-program-options1.35-dev,
18 libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev
19Standards-Version: 3.9.28Standards-Version: 3.9.2
20Homepage: http://www.bitcoin.org/9Homepage: http://www.bitcoin.org/
21Vcs-Git: git://git.debian.org/git/collab-maint/bitcoin10Vcs-Git: git://git.debian.org/git/collab-maint/bitcoin
2211
=== 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 @@
1Source: bitcoin1Source: bitcoin
2Section: utils2Section: utils
3Priority: optional3Priority: optional
4Maintainer: Jonas Smedegaard <dr@jones.dk>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
5Uploaders: Micah Anderson <micah@debian.org>6Uploaders: Micah Anderson <micah@debian.org>
6Build-Depends: @cdbs@7Build-Depends: @cdbs@
7Standards-Version: 3.9.28Standards-Version: 3.9.2
89
=== 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 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- mode: makefile; coding: utf-8 -*-2
3# Copyright © 2010-2011 Jonas Smedegaard <dr@jones.dk>3
4# Description: Main Debian packaging script for Bitcoin4%:
5#5 dh $@
6# This program is free software; you can redistribute it and/or6
7# modify it under the terms of the GNU General Public License as7override_dh_auto_configure:
8# published by the Free Software Foundation; either version 2, or (at8
9# your option) any later version.9override_dh_auto_build:
10#
11# This program is distributed in the hope that it will be useful, but
12# WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14# General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18
19-include /usr/share/cdbs/1/rules/upstream-tarball.mk
20include /usr/share/cdbs/1/class/makefile.mk
21include /usr/share/cdbs/1/rules/debhelper.mk
22include /usr/share/cdbs/1/rules/utils.mk
23
24# suppress optional build-dependencies
25CDBS_BUILD_DEPENDS_rules_upstream-tarball =
26CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
27
28DEB_UPSTREAM_URL = http://downloads.sourceforge.net/sourceforge/bitcoin
29DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/~(alpha|beta|rc)/\1/,s/$$/-src/
30DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
31DEB_UPSTREAM_TARBALL_MD5 = 045e1b4efd609c5b502d05488a5393b5
32
33# unneeded external project sources
34DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./src/cryptopp/
35
36# Silence .ico and .mo files in addition to the default debian files
37DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^src/rc/bitcoin.ico|locale/.*/LC_MESSAGES/.*.mo|debian/(changelog|copyright(|_hints|_newhints))$
38
39DEB_BUILDDIR = src
40
41DEB_MAKE_MAKEFILE = makefile.unix
42
43# Avoid GUI until wxWidget 2.9 is in Debian
44DEB_MAKE_BUILD_TARGET = bitcoind
45
46# Readd default flags
47CXXFLAGS += -D__WXGTK__ -DNOPCH -DUSE_SSL
48#CXXFLAGS += -Wno-invalid-offsetof -Wformat
49
50# Silence seemingly harmless noise about unused variables
51CXXFLAGS += -Wno-unused-variable
52
53# Use optimized miner for amd64 only
54CXXFLAGS += $(if $(filter amd64,$(DEB_HOST_ARCH)),-DFOURWAYSSE2)
55
56DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
57DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
58
59# Apparently any recent boost is ok. Unversioned Boost in Lenny is too
60# old, however (do not include libboost-system*), so add fallback to
61# ease backporting
62boostver =
63boostoldver = 1.35
64boostdep = $(foreach dep,$1,libboost-$(dep)$(boostver)-dev (>> $(boostoldver)) | libboost-$(dep)$(boostoldver)-dev$(comma) )
65
66CDBS_BUILD_DEPENDS += , $(call boostdep,system), libdb++-dev | libdb4.6++-dev, libssl-dev, libcrypto++-dev, pkg-config, libglib2.0-dev, libminiupnpc-dev
67# TODO: Drop this when maybe system json is used some day
68CDBS_BUILD_DEPENDS += , $(call boostdep,filesystem program-options thread)
69
70# FIXME: when available, enable this and install into -gui package
71#CDBS_BUILD_DEPENDS += , libwxgtk2.9-dev
72
73CDBS_SUGGESTS_bitcoind = db-util, db4.8-util, db4.7-util
74
75# Upstream README contains no parts relevant for Debian usage
76DEB_INSTALL_DOCS_ALL =
77
78pre-build::
79 mkdir -p src/obj/nogui
80clean::
81 find src/obj -type f -not -name .gitignore -delete
82 rm -f src/bitcoind
83
84# Ensure wrapper is set executable
85binary-post-install/bitcoind::
86 chmod +x $(cdbs_curdestdir)usr/bin/bitcoind

Subscribers

People subscribed via source and target branches

to all changes: