[Pkg-anonymity-tools] [onionshare] 02/05: merge 0.7 into debian

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian
in repository onionshare.

commit cc0838be21c9f26025c131e376c9502c72eb1e2b
Merge: 2f334b6 c0f049b
Author: Ulrike Uhlig <u at 451f.org>
Date:   Tue May 19 12:55:26 2015 +0200

    merge 0.7 into debian

 .gitignore                                         |   1 +
 BUILD.md                                           |  29 ++--
 CHANGELOG.md                                       |  11 +-
 MANIFEST.in                                        |   4 +-
 README.md                                          |  14 +-
 build_dmg.sh                                       |  61 ---------
 build_deb.sh => install/build_deb.sh               |   7 +-
 build_exe.bat => install/build_exe.bat             |   4 +-
 install/build_osx.sh                               |  30 ++++
 build_rpm.sh => install/build_rpm.sh               |   7 +-
 install/check_lacked_trans.py                      | 102 ++++++++++++++
 {setup => install}/license.txt                     |   0
 {bin => install/linux_scripts}/onionshare          |   0
 {bin => install/linux_scripts}/onionshare-gui      |   0
 {setup => install}/onionshare-launcher.py          |   4 +-
 {setup => install}/onionshare-win.spec             |   4 +-
 {setup => install}/onionshare.desktop              |   0
 {setup => install}/onionshare.icns                 | Bin
 install/onionshare.ico                             | Bin 0 -> 15086 bytes
 {setup => install}/onionshare.nsi                  |   4 +-
 {setup => install}/onionshare80.xpm                |   0
 {bin => install/osx_scripts}/onionshare            |  15 +-
 {bin => install/osx_scripts}/onionshare-gui        |  10 +-
 ppa_release.sh => install/ppa_release.sh           |   7 +-
 install/prepare_for_codesign.py                    |  36 +++++
 locale/de.json                                     |  10 +-
 locale/en.json                                     |   9 +-
 locale/es.json                                     |  12 +-
 locale/fi.json                                     |   9 +-
 locale/fr.json                                     |  10 +-
 locale/it.json                                     |   9 +-
 locale/nl.json                                     |   9 +-
 locale/no.json                                     |   9 +-
 locale/pt.json                                     |   9 +-
 locale/ru.json                                     |   7 +-
 locale/tr.json                                     |   7 +-
 onionshare/helpers.py                              |  49 ++++---
 onionshare/index.html                              |   2 +-
 onionshare/onionshare.py                           | 152 +++++++++++++++------
 onionshare/socks.py                                |  94 ++++++++-----
 onionshare/strings.py                              |   9 +-
 onionshare/web.py                                  |  51 ++++---
 onionshare_gui/common.py                           |  10 +-
 onionshare_gui/downloads.py                        |   3 +-
 onionshare_gui/file_selection.py                   |  25 ++--
 onionshare_gui/onionshare_gui.py                   |  12 +-
 onionshare_gui/options.py                          |   1 +
 onionshare_gui/server_status.py                    |  11 +-
 .../receiver.png                                   | Bin
 screenshots/sender_osx.png                         | Bin 0 -> 59059 bytes
 .../sender_win.png                                 | Bin
 setup.py                                           | 127 +++++++++++------
 setup/dmg_background.png                           | Bin 160976 -> 0 bytes
 setup/onionshare-osx.spec                          |  52 -------
 setup/onionshare.ico                               | Bin 16958 -> 0 bytes
 tails/README.md                                    |   2 +-
 tails/install_in_persistent_volume.sh              |   4 +-
 test/onionshare_helpers_test.py                    |  10 +-
 test/onionshare_strings_test.py                    |  10 +-
 test/onionshare_test.py                            |   8 +-
 test/onionshare_web_test.py                        |   8 +-
 test/test_helpers.py                               |  20 +--
 version                                            |   2 +-
 63 files changed, 682 insertions(+), 430 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git