Update contrib/debian to latest Ubuntu PPA upload.

This:
 * Partially reverts 9f68ed6 (which fixed spelling in a changelog,
   though generally changelogs should be append-only).
 * Disables UPnP support (PPA has not had it for a while, and I
   still don't trust miniupnpc, plus it seems uneccessary - its
   been a while since we needed to care about Bitcoin-Qt home users
   getting their inbound ports auto-mapped).
 * Enables ZMQ.
 * Forces GUI to Qt4 to fix various issues people have been seeing
   on Ubuntu and elsewhere with Qt5.
 * Reverts 70899d70b (Bitcoin does not enable "instant payments",
   not is transaction management "carried out collectively by the
   network", for whatever "transaction management" means, finally
   Bitcoin Core is not the only way to use the Bitcoin currency,
   as seemingly implied in the description).
This commit is contained in:
Matt Corallo 2017-05-03 09:54:35 -04:00
parent 35da2aeed7
commit 997021986e
3 changed files with 131 additions and 28 deletions

View file

@ -1,3 +1,104 @@
bitcoin (0.14.1-trusty1) trusty; urgency=medium
* New upstream release.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Sat, 22 Apr 2017 17:10:00 -0400
bitcoin (0.14.0-trusty1) trusty; urgency=medium
* New upstream release.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 08 Mar 2017 10:30:00 -0500
bitcoin (0.13.2-trusty1) trusty; urgency=medium
* New upstream release.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 05 Jan 2017 09:59:00 -0500
bitcoin (0.13.1-trusty2) trusty; urgency=medium
* Revert to Qt4, due to https://github.com/bitcoin/bitcoin/issues/9038
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 31 Oct 2016 11:16:00 -0400
bitcoin (0.13.1-trusty1) trusty; urgency=medium
* New upstream release.
* Backport updated bitcoin-qt.desktop from upstream master
* Add zmq dependency
* Switch to Qt5 (breaks precise, but that was already broken by C++11)
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 27 Oct 2016 17:32:00 -0400
bitcoin (0.13.0-trusty1) trusty; urgency=medium
* New upstream release.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Sun, 04 Sep 2016 22:09:00 -0400
bitcoin (0.12.1-trusty1) trusty; urgency=medium
* New upstream release.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 18 Apr 2016 14:26:00 -0700
bitcoin (0.12.0-trusty6) trusty; urgency=medium
* Fix program-options dep.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 25 Mar 2016 21:41:00 -0700
bitcoin (0.12.0-trusty5) trusty; urgency=medium
* Test explicit --with-gui
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 23:25:00 -0800
bitcoin (0.12.0-trusty4) trusty; urgency=medium
* Fix libevent-dev dep.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 23:25:00 -0800
bitcoin (0.12.0-trusty3) trusty; urgency=medium
* Fix precise boost dep.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 19:55:00 -0800
bitcoin (0.12.0-trusty2) trusty; urgency=medium
* Fix libevent dep.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 19:53:00 -0800
bitcoin (0.12.0-trusty1) trusty; urgency=medium
* New upstream release
* Various updates to contrib/debian were merged, a few were not
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 19:29:00 -0800
bitcoin (0.11.2-trusty1) trusty; urgency=low
* New upstream release.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 13 Nov 2015 18:39:00 -0800
bitcoin (0.11.1-trusty2) trusty; urgency=low
* Remove minupnpc builddep.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 14 Oct 2015 23:06:00 -1000
bitcoin (0.11.1-trusty1) trusty; urgency=high
* New upstream release.
* Disable all UPnP support.
-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 14 Oct 2015 13:57:00 -1000
bitcoin (0.11.0-precise1) precise; urgency=medium bitcoin (0.11.0-precise1) precise; urgency=medium
* New upstream release. * New upstream release.
@ -179,7 +280,7 @@ bitcoin (0.5.3-natty0) natty; urgency=low
bitcoin (0.5.2-natty1) natty; urgency=low bitcoin (0.5.2-natty1) natty; urgency=low
* Remove mentions on anonymity in package descriptions and manpage. * Remove mentions on anonymity in package descriptions and manpage.
These should never have been there, bitcoin isn't anonymous without These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and a ton of work that virtually no users will ever be willing and
capable of doing capable of doing
@ -220,7 +321,7 @@ bitcoin (0.5.0~rc1-natty1) natty; urgency=low
* Add test_bitcoin to build test * Add test_bitcoin to build test
* Fix clean * Fix clean
* Remove unnecessary build-dependancies * Remove uneccessary build-dependancies
-- Matt Corallo <matt@bluematt.me> Wed, 26 Oct 2011 14:37:18 -0400 -- Matt Corallo <matt@bluematt.me> Wed, 26 Oct 2011 14:37:18 -0400
@ -380,7 +481,7 @@ bitcoin (0.3.20.01~dfsg-1) unstable; urgency=low
bitcoin (0.3.19~dfsg-6) unstable; urgency=low bitcoin (0.3.19~dfsg-6) unstable; urgency=low
* Fix override aggressive optimizations. * Fix override agressive optimizations.
* Fix tighten build-dependencies to really fit backporting to Lenny: * Fix tighten build-dependencies to really fit backporting to Lenny:
+ Add fallback build-dependency on libdb4.6++-dev. + Add fallback build-dependency on libdb4.6++-dev.
+ Tighten unversioned Boost build-dependencies to recent versions, + Tighten unversioned Boost build-dependencies to recent versions,

View file

@ -1,27 +1,29 @@
Source: bitcoin Source: bitcoin
Section: utils Section: utils
Priority: optional Priority: optional
Maintainer: Jonas Smedegaard <dr@jones.dk> Maintainer: Matt Corallo <matt@mattcorallo.com>
Uploaders: Micah Anderson <micah@debian.org> Uploaders: Matt Corallo <matt@mattcorallo.com>
Build-Depends: debhelper, Build-Depends: debhelper,
devscripts, devscripts,
automake, automake,
libtool, libtool,
bash-completion, bash-completion,
libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
libdb4.8++-dev, libdb4.8++-dev,
libssl-dev, libssl-dev,
pkg-config, pkg-config,
libminiupnpc8-dev | libminiupnpc-dev (>> 1.6), libevent-dev,
libboost-filesystem-dev (>> 1.35) | libboost-filesystem1.35-dev, libboost-system1.48-dev | libboost-system-dev (>> 1.35),
libboost-program-options-dev (>> 1.35) | libboost-program-options1.35-dev, libboost-filesystem1.48-dev | libboost-filesystem-dev (>> 1.35),
libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev, libboost-program-options1.48-dev | libboost-program-options-dev (>> 1.35),
libboost-test-dev (>> 1.35) | libboost-test1.35-dev, libboost-thread1.48-dev | libboost-thread-dev (>> 1.35),
libboost-test1.48-dev | libboost-test-dev (>> 1.35),
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.35),
qt4-qmake, qt4-qmake,
libqt4-dev, libqt4-dev,
libqrencode-dev, libqrencode-dev,
libprotobuf-dev, protobuf-compiler, libprotobuf-dev, protobuf-compiler,
python python,
libzmq3-dev
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Homepage: https://bitcoincore.org/ Homepage: https://bitcoincore.org/
Vcs-Git: git://github.com/bitcoin/bitcoin.git Vcs-Git: git://github.com/bitcoin/bitcoin.git
@ -31,11 +33,11 @@ Package: bitcoind
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: peer-to-peer network based digital currency - daemon Description: peer-to-peer network based digital currency - daemon
Bitcoin is an experimental new digital currency that enables instant Bitcoin is a free open source peer-to-peer electronic cash system that
payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer is completely decentralized, without the need for a central server or
technology to operate with no central authority: managing transactions trusted parties. Users hold the crypto keys to their own money and
and issuing money are carried out collectively by the network. Bitcoin Core transact directly with each other, with the help of a P2P network to
is the name of the open source software which enables the use of this currency. check for double-spending.
. .
This package provides the daemon, bitcoind, and the CLI tool This package provides the daemon, bitcoind, and the CLI tool
bitcoin-cli to interact with the daemon. bitcoin-cli to interact with the daemon.
@ -44,11 +46,11 @@ Package: bitcoin-qt
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: peer-to-peer network based digital currency - Qt GUI Description: peer-to-peer network based digital currency - Qt GUI
Bitcoin is an experimental new digital currency that enables instant Bitcoin is a free open source peer-to-peer electronic cash system that
payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer is completely decentralized, without the need for a central server or
technology to operate with no central authority: managing transactions trusted parties. Users hold the crypto keys to their own money and
and issuing money are carried out collectively by the network. Bitcoin Core transact directly with each other, with the help of a P2P network to
is the name of the open source software which enables the use of this currency. check for double-spending.
. .
This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt.
@ -56,11 +58,11 @@ Package: bitcoin-tx
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: peer-to-peer digital currency - standalone transaction tool Description: peer-to-peer digital currency - standalone transaction tool
Bitcoin is an experimental new digital currency that enables instant Bitcoin is a free open source peer-to-peer electronic cash system that
payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer is completely decentralized, without the need for a central server or
technology to operate with no central authority: managing transactions trusted parties. Users hold the crypto keys to their own money and
and issuing money are carried out collectively by the network. Bitcoin Core transact directly with each other, with the help of a P2P network to
is the name of the open source software which enables the use of this currency. check for double-spending.
. .
This package provides bitcoin-tx, a command-line transaction creation This package provides bitcoin-tx, a command-line transaction creation
tool which can be used without a bitcoin daemon. Some means of tool which can be used without a bitcoin daemon. Some means of

View file

@ -15,7 +15,7 @@ override_dh_auto_clean:
# Yea, autogen should be run on the source archive, but I like doing git archive # Yea, autogen should be run on the source archive, but I like doing git archive
override_dh_auto_configure: override_dh_auto_configure:
./autogen.sh ./autogen.sh
./configure ./configure --without-miniupnpc --with-gui=qt4
override_dh_auto_test: override_dh_auto_test:
make check make check