[Pkg-bitcoin-commits] [electrum] 02/05: Merge tag 'upstream/2.5.1'

Tristan Seligmann mithrandi at moszumanska.debian.org
Fri Oct 23 19:04:01 UTC 2015


This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit dcea4ea5885ee4eeb9f0ee68e602f6263a4a8747
Merge: ee54b07 88651f9
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Oct 19 04:55:16 2015 +0200

    Merge tag 'upstream/2.5.1'
    
    Upstream version 2.5.1
    
    # gpg: Signature made Mon 19 Oct 2015 04:55:13 SAST
    # gpg:                using RSA key 0xC08990FB1F637893
    # gpg: Good signature from "Tristan Seligmann <mithrandi at mithrandi.net>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at debian.org>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at keybase.io>" [ultimate]
    # gpg: Signature notation: issuer-fpr at notations.openpgp.fifthhorseman.net=5C06568575516D0A33FFA7A3C08990FB1F637893
    # Primary key fingerprint: DB24 E315 EDAA AC13 D646  7099 58C0 FB1C DE3B 7600
    #      Subkey fingerprint: 5C06 5685 7551 6D0A 33FF  A7A3 C089 90FB 1F63 7893

 Electrum.egg-info/PKG-INFO                         |   2 +-
 Electrum.egg-info/SOURCES.txt                      |  42 +-
 MANIFEST.in                                        |   5 +-
 PKG-INFO                                           |   2 +-
 RELEASE-NOTES                                      |  21 +-
 app.fil                                            |   3 -
 electrum                                           | 403 +++++----
 gui/__init__.py                                    |   2 +-
 gui/android.py                                     |  80 +-
 gui/gtk.py                                         |  80 +-
 gui/jsonrpc.py                                     |   6 +-
 gui/kivy/__init__.py                               |  87 ++
 gui/kivy/main_window.py                            | 751 ++++++++++++++++
 gui/kivy/nfc_scanner/__init__.py                   |  44 +
 gui/kivy/nfc_scanner/scanner_android.py            | 243 ++++++
 gui/kivy/nfc_scanner/scanner_dummy.py              |  52 ++
 gui/kivy/qr_scanner/__init__.py                    |  60 ++
 gui/kivy/qr_scanner/scanner_android.py             | 359 ++++++++
 gui/kivy/qr_scanner/scanner_camera.py              |  96 +++
 gui/kivy/uix/__init__.py                           |   1 +
 gui/kivy/uix/combobox.py                           |  93 ++
 gui/kivy/uix/dialogs/__init__.py                   | 190 +++++
 gui/kivy/uix/dialogs/carousel_dialog.py            | 242 ++++++
 gui/kivy/uix/dialogs/create_restore.py             | 501 +++++++++++
 gui/kivy/uix/dialogs/installwizard.py              | 355 ++++++++
 gui/kivy/uix/dialogs/new_contact.py                |  20 +
 gui/kivy/uix/dialogs/nfc_transaction.py            |  32 +
 gui/kivy/uix/dialogs/qr_scanner.py                 |  44 +
 gui/kivy/uix/drawer.py                             | 257 ++++++
 gui/kivy/uix/gridview.py                           | 205 +++++
 gui/kivy/uix/menus.py                              |  95 +++
 gui/kivy/uix/qrcodewidget.py                       | 148 ++++
 gui/kivy/uix/screens.py                            | 425 +++++++++
 gui/qt/__init__.py                                 | 279 +++---
 gui/qt/amountedit.py                               |   3 +-
 gui/qt/history_widget.py                           |  36 +-
 gui/qt/history_widget_lite.py                      |  25 -
 gui/qt/icons_rc.py                                 |   2 +-
 gui/qt/installwizard.py                            |  71 +-
 gui/qt/lite_window.py                              | 868 -------------------
 gui/qt/main_window.py                              | 554 ++++++------
 gui/qt/receiving_widget.py                         |  77 --
 gui/qt/themes/cleanlook/name.cfg                   |   1 -
 gui/qt/themes/cleanlook/style.css                  |  62 --
 gui/qt/themes/dark/name.cfg                        |   1 -
 gui/qt/themes/dark/style.css                       |  35 -
 gui/qt/themes/sahara/name.cfg                      |   1 -
 gui/qt/themes/sahara/style.css                     | 102 ---
 gui/qt/util.py                                     | 156 ++--
 gui/qt/version_getter.py                           | 125 ---
 gui/stdio.py                                       |  22 +-
 gui/text.py                                        |  43 +-
 icons/electrum_android_launcher_icon.png           | Bin 0 -> 224703 bytes
 lib/__init__.py                                    |   6 +-
 lib/bitcoin.py                                     |  15 +-
 lib/blockchain.py                                  |   5 +-
 lib/commands.py                                    |  58 +-
 lib/daemon.py                                      | 254 ------
 lib/interface.py                                   | 345 ++++----
 lib/locale/bg_BG/LC_MESSAGES/electrum.mo           | Bin 43843 -> 44505 bytes
 lib/locale/cs_CZ/LC_MESSAGES/electrum.mo           | Bin 33456 -> 33571 bytes
 lib/locale/da_DK/LC_MESSAGES/electrum.mo           | Bin 33385 -> 33385 bytes
 lib/locale/de_DE/LC_MESSAGES/electrum.mo           | Bin 34180 -> 34259 bytes
 lib/locale/pl_PL/LC_MESSAGES/electrum.mo           | Bin 33531 -> 33521 bytes
 lib/locale/th_TH/LC_MESSAGES/electrum.mo           | Bin 32188 -> 32188 bytes
 lib/network.py                                     | 455 ++++++----
 lib/network_proxy.py                               | 236 -----
 lib/paymentrequest.py                              |   1 +
 lib/plugins.py                                     | 211 +++--
 lib/rsakey.py                                      |   5 +
 lib/simple_config.py                               |   2 +-
 lib/synchronizer.py                                |  19 +-
 lib/tests/test_account.py                          | 123 +++
 lib/tests/test_interface.py                        |  14 +-
 lib/tests/test_mnemonic.py                         |  34 +
 lib/tests/test_transaction.py                      | 206 +++++
 lib/tests/test_wallet.py                           |   3 +-
 lib/transaction.py                                 |  15 +-
 lib/util.py                                        | 110 ++-
 lib/verifier.py                                    |  75 +-
 lib/version.py                                     |   2 +-
 lib/wallet.py                                      | 125 +--
 lib/websockets.py                                  |   4 +-
 packages/requests/__init__.py                      |  10 +-
 packages/requests/adapters.py                      |  34 +-
 packages/requests/api.py                           |  40 +-
 packages/requests/auth.py                          |  74 +-
 packages/requests/cacert.pem                       | 262 +++---
 packages/requests/compat.py                        |  53 --
 packages/requests/cookies.py                       | 116 ++-
 packages/requests/hooks.py                         |  17 +-
 packages/requests/models.py                        | 109 +--
 packages/requests/packages/__init__.py             |  35 +-
 packages/requests/packages/urllib3/__init__.py     |  11 +-
 packages/requests/packages/urllib3/_collections.py | 227 +++--
 packages/requests/packages/urllib3/connection.py   |  31 +-
 .../requests/packages/urllib3/connectionpool.py    | 129 ++-
 .../requests/packages/urllib3/contrib/appengine.py | 222 +++++
 .../requests/packages/urllib3/contrib/pyopenssl.py |  60 +-
 packages/requests/packages/urllib3/exceptions.py   |  34 +
 packages/requests/packages/urllib3/poolmanager.py  |  23 +-
 packages/requests/packages/urllib3/request.py      |  12 +-
 packages/requests/packages/urllib3/response.py     | 302 +++++--
 .../requests/packages/urllib3/util/connection.py   |  11 +-
 .../requests/packages/urllib3/util/response.py     |  51 ++
 packages/requests/packages/urllib3/util/retry.py   |   4 +-
 packages/requests/packages/urllib3/util/ssl_.py    | 108 ++-
 packages/requests/packages/urllib3/util/url.py     |   2 +
 packages/requests/sessions.py                      |  60 +-
 packages/requests/status_codes.py                  |   2 +-
 packages/requests/utils.py                         |  73 +-
 packages/six.py                                    |  74 +-
 plugins/__init__.py                                |   6 +-
 plugins/audio_modem.py                             |  10 +-
 plugins/btchipwallet.py                            |  25 +-
 plugins/cosigner_pool.py                           | 160 ++--
 plugins/email_requests.py                          |  44 +-
 plugins/exchange_rate.py                           | 946 ++++++++++-----------
 plugins/greenaddress_instant.py                    |  53 +-
 plugins/keepkey.py                                 |  72 +-
 plugins/labels.py                                  | 192 +++--
 plugins/plot.py                                    |  15 +-
 plugins/trezor.py                                  |  50 +-
 plugins/trustedcoin.py                             | 371 ++++----
 plugins/virtualkeyboard.py                         |  12 +-
 scripts/block_headers                              |   4 +-
 scripts/check_hist                                 |  15 -
 scripts/check_hist~                                |  11 -
 scripts/estimate_fee                               |   6 +-
 scripts/get_history                                |   9 +-
 scripts/merchant/merchant.py                       |  20 +-
 scripts/peers                                      |   5 +-
 scripts/servers                                    |   2 +-
 scripts/txradar                                    |   3 +-
 scripts/util.py                                    | 129 +--
 scripts/util.pyc                                   | Bin 2207 -> 3246 bytes
 scripts/watch_address                              |   4 +-
 setup.py                                           |  17 +-
 test.py                                            |  10 +
 139 files changed, 9059 insertions(+), 5050 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git



More information about the Pkg-bitcoin-commits mailing list