[Pkg-privacy-commits] [onionshare] 88/256: Merge branch 'pyinstaller'

[Ulrike Uhlig]

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

ulrike pushed a commit to branch master
in repository onionshare.

commit ab20311f6e9faae3399cef125f7acecd7a7a9adf
Merge: 7b068fe 304e6db
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Feb 21 17:16:16 2017 -0800

    Merge branch 'pyinstaller'

 BUILD.md                                       |  55 ++++-------
 install/build_deb.sh                           |   2 +-
 install/build_exe.bat                          |   2 +-
 install/build_osx.sh                           |   2 +-
 install/build_rpm.sh                           |   2 +-
 install/ppa_release.sh                         |   2 +-
 install/pyinstaller.spec                       |  61 ++++++++++++
 install/requirements-windows.txt               |  13 +++
 install/requirements.txt                       |  10 ++
 onionshare/helpers.py                          |  17 ++--
 setup.py                                       | 123 +++++--------------------
 {resources => share}/html/404.html             |   0
 {resources => share}/html/denied.html          |   0
 {resources => share}/html/index.html           |   0
 {resources => share}/images/drop_files.png     | Bin
 {resources => share}/images/logo.png           | Bin
 {resources => share}/images/server_started.png | Bin
 {resources => share}/images/server_stopped.png | Bin
 {resources => share}/images/server_working.png | Bin
 {resources => share}/license.txt               |   0
 {resources => share}/locale/cs.json            |   0
 {resources => share}/locale/de.json            |   0
 {resources => share}/locale/en.json            |   0
 {resources => share}/locale/eo.json            |   0
 {resources => share}/locale/es.json            |   0
 {resources => share}/locale/fi.json            |   0
 {resources => share}/locale/fr.json            |   0
 {resources => share}/locale/it.json            |   0
 {resources => share}/locale/nl.json            |   0
 {resources => share}/locale/no.json            |   0
 {resources => share}/locale/pt.json            |   0
 {resources => share}/locale/ru.json            |   0
 {resources => share}/locale/tr.json            |   0
 {resources => share}/version.txt               |   0
 {resources => share}/wordlist.txt              |   0
 test/onionshare_strings_test.py                |   2 +-
 36 files changed, 142 insertions(+), 149 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git