[Pkg-privacy-commits] [torbrowser-launcher] 238/476: Merge branch 'fix_75_share' of https://github.com/boyska/torbrowser-launcher into boyska-fix_75_share

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit cc547a8c452943b655d3e0ea12e282dbf745dbe8
Merge: 128e870 0da3f8d
Author: Micah Lee <micah at micahflee.com>
Date:   Wed Jul 9 11:08:56 2014 -0700

    Merge branch 'fix_75_share' of https://github.com/boyska/torbrowser-launcher into boyska-fix_75_share
    
    Conflicts:
    	README.md

 .gitignore                                         |   1 +
 README.md                                          |   5 +++++
 requirements.txt                                   |   2 ++
 setup.py                                           |  20 +++++++++++------
 .../applications/torbrowser-settings.desktop       |   0
 .../applications/torbrowser.desktop                |   0
 {img => share/pixmaps}/torbrowser32.xpm            |   0
 {img => share/pixmaps}/torbrowser80.xpm            |   0
 {keys => share/torbrowser-launcher}/alexandre.asc  |   0
 {keys => share/torbrowser-launcher}/erinn.asc      |   0
 .../torbrowser-launcher/locale}/en/messages.pot    |   0
 .../torbrowser-launcher/locale}/nl_NL/messages.pot |   0
 .../torbrowser-launcher/locale}/pl/messages.pot    |   0
 .../torbrowser-launcher}/mike-2013-09.asc          |   0
 {keys => share/torbrowser-launcher}/mike.asc       |   0
 .../torbrowser-launcher/mirrors.txt                |   0
 modem.ogg => share/torbrowser-launcher/modem.ogg   | Bin
 {keys => share/torbrowser-launcher}/sebastian.asc  |   0
 .../torbrowser-launcher/torproject.pem             |   0
 version => share/torbrowser-launcher/version       |   0
 torbrowser-launcher                                |  25 ++++++++++++---------
 21 files changed, 35 insertions(+), 18 deletions(-)

diff --cc README.md
index e77f2b0,5442dc6..ae3be1a
--- a/README.md
+++ b/README.md
@@@ -32,8 -30,12 +32,13 @@@ Optionally you can install python-pygam
      ./build_rpm.sh
      sudo yum install dist/torbrowser-launcher-*.rpm
  
 +Optionally you can install pygame if you want to play a modem sound while Tor Browser is launching.
 +
+ ### Run without installing
+ 
 -Install the dependencies: sadly, not all of them are available in virtualenv,
 -so you will need to install (some of) them system-wide.
 -Then, you can run TBL_SHARE=share ./torbrowser-launcher
++Install the dependencies: sadly, not all of them are available in virtualenv, so you will need to install (some of) them system-wide.
++Then, you can run: `TBL_SHARE=share ./torbrowser-launcher`
+ 
  ## Installing in Ubuntu
  
  I've created a PPA where I'm maintaining torbrowser-launcher binaries. You can install in an Ubuntu-based distribution like this:

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