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
1=== added file '.pc/.quilt_patches'
2--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
3+++ .pc/.quilt_patches 2014-05-19 20:25:27 +0000
4@@ -0,0 +1,1 @@
5+debian/patches
6
7=== added file '.pc/.quilt_series'
8--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
9+++ .pc/.quilt_series 2014-05-19 20:25:27 +0000
10@@ -0,0 +1,1 @@
11+series
12
13=== modified file 'debian/NEWS'
14--- debian/NEWS 2011-05-17 15:31:24 +0000
15+++ debian/NEWS 2014-05-19 20:25:27 +0000
16@@ -1,3 +1,12 @@
17+bitcoin (0.3.24~dfsg-1ubuntu0.2) precise-proposed; urgency=low
18+
19+ * bitcoin is very out of date and has been removed
20+ Please see upstream sources at
21+ https://github.com/bitcoin/bitcoin/ or the PPA at
22+ https://launchpad.net/~bitcoin/+archive/bitcoin
23+
24+ -- Scott Howard <showard@debian.org> Mon, 19 May 2014 13:54:10 -0400
25+
26 bitcoin (0.3.21~dfsg-1) unstable; urgency=low
27
28 * Bitcoin is now linked against Berkeley DB 5.1, and from now on
29
30=== modified file 'debian/bin/bitcoind'
31--- debian/bin/bitcoind 2011-03-16 09:11:06 +0000
32+++ debian/bin/bitcoind 2014-05-19 20:25:27 +0000
33@@ -1,18 +1,6 @@
34 #!/bin/sh
35
36-set -e
37-
38-umask 077
39-
40-basedir=~/.bitcoin
41-dbfile="$basedir/DB_CONFIG"
42-cfgfile="$basedir/bitcoin.conf"
43-
44-[ -e "$basedir" ] || mkdir "$basedir"
45-
46-[ -e "$cfgfile" ] || perl -le 'print"rpcpassword=",map{(a..z,A..Z,0..9)[rand 62]}0..9' > "$cfgfile"
47-
48-# Bitcoin does not clean up DB log files by default
49-[ -e "$dbfile" ] || echo 'set_flags DB_LOG_AUTOREMOVE' > "$dbfile"
50-
51-exec /usr/lib/bitcoin/bitcoind "$@"
52+
53+echo "bitcoin is very out of date and has been removed.
54+Please see upstream sources at https://github.com/bitcoin/bitcoin/
55+or the PPA at https://launchpad.net/~bitcoin/+archive/bitcoin"
56
57=== removed file 'debian/bitcoin-gui.menu'
58--- debian/bitcoin-gui.menu 2011-01-17 19:48:35 +0000
59+++ debian/bitcoin-gui.menu 1970-01-01 00:00:00 +0000
60@@ -1,2 +0,0 @@
61-?package(bitcoin):needs="X11" section="Applications/Utils"\
62- title="Bitcoin" command="/usr/bin/bitcoin"
63
64=== removed file 'debian/bitcoind.examples'
65--- debian/bitcoind.examples 2011-03-01 15:55:04 +0000
66+++ debian/bitcoind.examples 1970-01-01 00:00:00 +0000
67@@ -1,1 +0,0 @@
68-debian/examples/bitcoin.conf
69
70=== modified file 'debian/bitcoind.install'
71--- debian/bitcoind.install 2011-03-01 15:55:04 +0000
72+++ debian/bitcoind.install 2014-05-19 20:25:27 +0000
73@@ -1,2 +1,1 @@
74-debian/bin/bitcoind usr/bin
75-src/bitcoind usr/lib/bitcoin
76+debian/bin/bitcoind /usr/bin
77
78=== removed file 'debian/bitcoind.lintian-overrides'
79--- debian/bitcoind.lintian-overrides 2011-03-01 15:55:04 +0000
80+++ debian/bitcoind.lintian-overrides 1970-01-01 00:00:00 +0000
81@@ -1,2 +0,0 @@
82-# Linked code is Expat - only Debian packaging is GPL-2+
83-bitcoind: possible-gpl-code-linked-with-openssl
84
85=== removed file 'debian/bitcoind.manpages'
86--- debian/bitcoind.manpages 2011-03-01 15:55:04 +0000
87+++ debian/bitcoind.manpages 1970-01-01 00:00:00 +0000
88@@ -1,2 +0,0 @@
89-debian/manpages/bitcoind.1
90-debian/manpages/bitcoin.conf.5
91
92=== modified file 'debian/changelog'
93--- debian/changelog 2011-07-19 15:08:54 +0000
94+++ debian/changelog 2014-05-19 20:25:27 +0000
95@@ -1,3 +1,19 @@
96+bitcoin (0.3.24~dfsg-1ubuntu0.2) precise-proposed; urgency=low
97+
98+ * bitcoin is very out of date and has been removed from Ubuntu
99+ Please see upstream sources at
100+ https://github.com/bitcoin/bitcoin/ or the PPA at
101+ https://launchpad.net/~bitcoin/+archive/bitcoin (LP: #1314616)
102+
103+ -- Scott Howard <showard@debian.org> Mon, 19 May 2014 13:56:33 -0400
104+
105+bitcoin (0.3.24~dfsg-1ubuntu0.1) precise-proposed; urgency=low
106+
107+ * Updates bitcoin wrapper for May 15 mandatory network upgrade
108+ (LP: #1159832)
109+
110+ -- Scott Howard <showard@debian.org> Sun, 28 Apr 2013 20:27:51 -0400
111+
112 bitcoin (0.3.24~dfsg-1) unstable; urgency=low
113
114 * New upstream release.
115
116=== modified file 'debian/control'
117--- debian/control 2011-07-19 15:08:54 +0000
118+++ debian/control 2014-05-19 20:25:27 +0000
119@@ -1,21 +1,10 @@
120 Source: bitcoin
121 Section: utils
122 Priority: optional
123-Maintainer: Jonas Smedegaard <dr@jones.dk>
124+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
125+XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
126 Uploaders: Micah Anderson <micah@debian.org>
127-Build-Depends: cdbs,
128- debhelper (>= 6),
129- dh-buildinfo,
130- libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
131- libdb++-dev | libdb4.6++-dev,
132- libssl-dev,
133- libcrypto++-dev,
134- pkg-config,
135- libglib2.0-dev,
136- libminiupnpc-dev,
137- libboost-filesystem-dev (>> 1.35) | libboost-filesystem1.35-dev,
138- libboost-program-options-dev (>> 1.35) | libboost-program-options1.35-dev,
139- libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev
140+Build-Depends: debhelper (>= 6)
141 Standards-Version: 3.9.2
142 Homepage: http://www.bitcoin.org/
143 Vcs-Git: git://git.debian.org/git/collab-maint/bitcoin
144
145=== modified file 'debian/control.in'
146--- debian/control.in 2011-07-19 15:08:54 +0000
147+++ debian/control.in 2014-05-19 20:25:27 +0000
148@@ -1,7 +1,8 @@
149 Source: bitcoin
150 Section: utils
151 Priority: optional
152-Maintainer: Jonas Smedegaard <dr@jones.dk>
153+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
154+XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
155 Uploaders: Micah Anderson <micah@debian.org>
156 Build-Depends: @cdbs@
157 Standards-Version: 3.9.2
158
159=== modified file 'debian/rules'
160--- debian/rules 2011-07-19 15:08:54 +0000
161+++ debian/rules 2014-05-19 20:25:27 +0000
162@@ -1,86 +1,9 @@
163 #!/usr/bin/make -f
164-# -*- mode: makefile; coding: utf-8 -*-
165-# Copyright © 2010-2011 Jonas Smedegaard <dr@jones.dk>
166-# Description: Main Debian packaging script for Bitcoin
167-#
168-# This program is free software; you can redistribute it and/or
169-# modify it under the terms of the GNU General Public License as
170-# published by the Free Software Foundation; either version 2, or (at
171-# your option) any later version.
172-#
173-# This program is distributed in the hope that it will be useful, but
174-# WITHOUT ANY WARRANTY; without even the implied warranty of
175-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
176-# General Public License for more details.
177-#
178-# You should have received a copy of the GNU General Public License
179-# along with this program. If not, see <http://www.gnu.org/licenses/>.
180-
181--include /usr/share/cdbs/1/rules/upstream-tarball.mk
182-include /usr/share/cdbs/1/class/makefile.mk
183-include /usr/share/cdbs/1/rules/debhelper.mk
184-include /usr/share/cdbs/1/rules/utils.mk
185-
186-# suppress optional build-dependencies
187-CDBS_BUILD_DEPENDS_rules_upstream-tarball =
188-CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
189-
190-DEB_UPSTREAM_URL = http://downloads.sourceforge.net/sourceforge/bitcoin
191-DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/~(alpha|beta|rc)/\1/,s/$$/-src/
192-DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
193-DEB_UPSTREAM_TARBALL_MD5 = 045e1b4efd609c5b502d05488a5393b5
194-
195-# unneeded external project sources
196-DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./src/cryptopp/
197-
198-# Silence .ico and .mo files in addition to the default debian files
199-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^src/rc/bitcoin.ico|locale/.*/LC_MESSAGES/.*.mo|debian/(changelog|copyright(|_hints|_newhints))$
200-
201-DEB_BUILDDIR = src
202-
203-DEB_MAKE_MAKEFILE = makefile.unix
204-
205-# Avoid GUI until wxWidget 2.9 is in Debian
206-DEB_MAKE_BUILD_TARGET = bitcoind
207-
208-# Readd default flags
209-CXXFLAGS += -D__WXGTK__ -DNOPCH -DUSE_SSL
210-#CXXFLAGS += -Wno-invalid-offsetof -Wformat
211-
212-# Silence seemingly harmless noise about unused variables
213-CXXFLAGS += -Wno-unused-variable
214-
215-# Use optimized miner for amd64 only
216-CXXFLAGS += $(if $(filter amd64,$(DEB_HOST_ARCH)),-DFOURWAYSSE2)
217-
218-DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/*
219-DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
220-
221-# Apparently any recent boost is ok. Unversioned Boost in Lenny is too
222-# old, however (do not include libboost-system*), so add fallback to
223-# ease backporting
224-boostver =
225-boostoldver = 1.35
226-boostdep = $(foreach dep,$1,libboost-$(dep)$(boostver)-dev (>> $(boostoldver)) | libboost-$(dep)$(boostoldver)-dev$(comma) )
227-
228-CDBS_BUILD_DEPENDS += , $(call boostdep,system), libdb++-dev | libdb4.6++-dev, libssl-dev, libcrypto++-dev, pkg-config, libglib2.0-dev, libminiupnpc-dev
229-# TODO: Drop this when maybe system json is used some day
230-CDBS_BUILD_DEPENDS += , $(call boostdep,filesystem program-options thread)
231-
232-# FIXME: when available, enable this and install into -gui package
233-#CDBS_BUILD_DEPENDS += , libwxgtk2.9-dev
234-
235-CDBS_SUGGESTS_bitcoind = db-util, db4.8-util, db4.7-util
236-
237-# Upstream README contains no parts relevant for Debian usage
238-DEB_INSTALL_DOCS_ALL =
239-
240-pre-build::
241- mkdir -p src/obj/nogui
242-clean::
243- find src/obj -type f -not -name .gitignore -delete
244- rm -f src/bitcoind
245-
246-# Ensure wrapper is set executable
247-binary-post-install/bitcoind::
248- chmod +x $(cdbs_curdestdir)usr/bin/bitcoind
249+
250+
251+%:
252+ dh $@
253+
254+override_dh_auto_configure:
255+
256+override_dh_auto_build:

Subscribers

People subscribed via source and target branches

to all changes: