Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock x-debbugs-cc: pkg-anonymity-tools@lists.alioth.debian.org Hi, this is a pre-approval unblock request for torbrowser-launcher and a new upstream version bringing three meaningful changes to this package in contrib: Directly from the upstream changelog: ## 0.1.7 * You can now pass URLs into TBL, and set it as your default browser * Hides TBL window before launching TBB * Default mirror switched to https://dist.torproject.org/ * Added AppData file to look better in software centers * Exclude AppArmor profiles in Ubuntu, where they're broken The most important fix is the mirror change but the other two are also a.) very nice to have b.) for users and c.) for us maintainers to have less diff to support tbl during jessies lifetime. The diff is really not much: # (yes, the tag naming scheme has changed...) $ git diff 0.1.6-1..debian/0.1.7-1|diffstat CHANGELOG.md | 8 + README.md | 8 - debian/changelog | 6 locale/pl/messages.pot | 162 +++++++++++++++++++++++++ screenshot.png |binary setup.py | 10 - share/appdata/torbrowser.appdata.xml | 30 ++++ share/applications/torbrowser-settings.desktop | 2 share/applications/torbrowser.desktop | 3 share/torbrowser-launcher/version | 2 torbrowser_launcher/__init__.py | 16 ++ torbrowser_launcher/common.py | 2 torbrowser_launcher/launcher.py | 17 +- 13 files changed, 245 insertions(+), 21 deletions(-) I feel a bit uneasy about asking for pre-approval despite I think (and have verified) the changes are fine), well, obviously because it's against the "current storyline", but then I've read https://release.debian.org/jessie/freeze_policy.html again and it specifically lists "pre-approved fixes (until the 5th of January 2015)" under "Changes which can be considered" - so I'm asking for a pre-approval ;-) If you decline this, fine, np, but then I would like to (help) clarify freeze_policy.html... torbrowser-launcher/0.1.7-1~experimental1 has been uploaded already, IOW, I can upload to sid anytime :-) $ git log -p 0.1.6-1..debian/0.1.7-1 > 0.1.7-1.gitdiff # is attached Thanks for your work on jessie! cheers, Holger
commit f559a5eb46b14c0038223771c4397c936c479a8b
Author: Ulrike Uhlig <u@451f.org>
Date: Mon Dec 1 22:15:22 2014 +0100
new upstream version 0.1.7
diff --git a/debian/changelog b/debian/changelog
index cfa0228..1d0d5c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+torbrowser-launcher (0.1.7-1) experimental; urgency=medium
+
+ * New upstream version.
+
+ -- Ulrike Uhlig <u@451f.org> Mon, 01 Dec 2014 21:38:01 +0100
+
torbrowser-launcher (0.1.6-1) unstable; urgency=medium
* New upstream version. (Closes: #766302)
commit c8c901454432660b52b86c6db8a47b2316bd37ca
Merge: 2afee16 7b113e5
Author: Ulrike Uhlig <u@451f.org>
Date: Mon Dec 1 21:37:31 2014 +0100
Merge tag 'v0.1.7' into debian
Version 0.1.7
commit 7b113e53af4c1520ccdfb7d8350b8a28bd1ec13a
Author: Micah Lee <micah@micahflee.com>
Date: Tue Nov 25 17:30:38 2014 -0800
version bump to 0.1.7 and updated changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db4e4a4..d270bb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Tor Browser Launcher Changelog
+## 0.1.7
+
+* You can now pass URLs into TBL, and set it as your default browser
+* Hides TBL window before launching TBB
+* Default mirror switched to https://dist.torproject.org/
+* Added AppData file to look better in software centers
+* Exclude AppArmor profiles in Ubuntu, where they're broken
+
## 0.1.6
* Updated licensing confusion to just be MIT in all locations
diff --git a/share/torbrowser-launcher/version b/share/torbrowser-launcher/version
index 4ac0de4..1180819 100644
--- a/share/torbrowser-launcher/version
+++ b/share/torbrowser-launcher/version
@@ -1 +1 @@
-0.1.7dev
+0.1.7
commit 185c5de30e5080bd5a8ca4aa86bf4f68a7a114d6
Author: Micah Lee <micah@micahflee.com>
Date: Tue Nov 25 13:49:30 2014 -0800
renaming torbrowser-launcher.appdata.xml to torbrowser.appdata.xml because the .desktop is torbrowser.desktop
diff --git a/share/appdata/torbrowser-launcher.appdata.xml b/share/appdata/torbrowser-launcher.appdata.xml
deleted file mode 100644
index 881c6fb..0000000
--- a/share/appdata/torbrowser-launcher.appdata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Micah Lee <micah@micahflee.com> -->
-<application>
- <id type="desktop">torbrowser-launcher.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>MIT</project_license>
- <name>Tor Browser Launcher</name>
- <summary>A program to help you download, keep updated, and run the Tor Browser Bundle</summary>
- <description>
- <p>Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. It downloads the same TBB from torproject.org that everyone else uses, and it doesn't alter it in any way. But it does make it much more usable, and it makes the task of keeping it up-to-date more secure.</p>
- <p>You install torbrowser-launcher from your distribution's package manager and it handles everything else, including:</p>
- <ul>
- <li>Downloading the most recent version of TBB for you, in your language and for your architecture</li>
- <li>Automatically updating (while preserving your bookmarks and preferences)</li>
- <li>Verifying the TBB's GnuPG signature</li>
- <li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li>
- <li>Adding a Tor Browser application launcher to your desktop environment's menu</li>
- <li>Lets you set Tor Browser as your default browser</li>
- <li>Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)</li>
- </ul>
- </description>
- <screenshots>
- <screenshot type="default">
- <image>https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/screenshot.png</image>
- <caption>Window to change Tor Browser Launcher settings</caption>
- </screenshot>
- </screenshots>
- <url type="homepage">https://github.com/micahflee/torbrowser-launcher</url>
- <updatecontact>micah@micahflee.com</updatecontact>
-</application>
diff --git a/share/appdata/torbrowser.appdata.xml b/share/appdata/torbrowser.appdata.xml
new file mode 100644
index 0000000..5a5a0bd
--- /dev/null
+++ b/share/appdata/torbrowser.appdata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Micah Lee <micah@micahflee.com> -->
+<application>
+ <id type="desktop">torbrowser.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>MIT</project_license>
+ <name>Tor Browser Launcher</name>
+ <summary>A program to help you download, keep updated, and run the Tor Browser Bundle</summary>
+ <description>
+ <p>Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. It downloads the same TBB from torproject.org that everyone else uses, and it doesn't alter it in any way. But it does make it much more usable, and it makes the task of keeping it up-to-date more secure.</p>
+ <p>You install torbrowser-launcher from your distribution's package manager and it handles everything else, including:</p>
+ <ul>
+ <li>Downloading the most recent version of TBB for you, in your language and for your architecture</li>
+ <li>Automatically updating (while preserving your bookmarks and preferences)</li>
+ <li>Verifying the TBB's GnuPG signature</li>
+ <li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li>
+ <li>Adding a Tor Browser application launcher to your desktop environment's menu</li>
+ <li>Lets you set Tor Browser as your default browser</li>
+ <li>Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)</li>
+ </ul>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/screenshot.png</image>
+ <caption>Window to change Tor Browser Launcher settings</caption>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">https://github.com/micahflee/torbrowser-launcher</url>
+ <updatecontact>micah@micahflee.com</updatecontact>
+</application>
commit 52d514452bab8a31313bdc342008a60205bc7b7d
Author: Micah Lee <micah@micahflee.com>
Date: Tue Nov 25 13:44:33 2014 -0800
updated AppData XML, and made the screenshot larger
diff --git a/README.md b/README.md
index 364dfe6..5cf3548 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-
-
# Tor Browser Launcher
Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install ```torbrowser-launcher``` from your distribution's package manager and it handles everything else, including:
@@ -15,6 +13,8 @@ Tor Browser Launcher is included in Ubuntu 14.10+, Debian 8+, and Fedora 20+. To
You might want to check out the [security design doc](/security_design.md).
+
+
## Installing in Ubuntu 14.04 and earlier
I've created a PPA where I'm maintaining torbrowser-launcher binaries. You can install in an Ubuntu-based distribution like this:
diff --git a/screenshot.png b/screenshot.png
index 0cad75e..97945f6 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/share/appdata/torbrowser-launcher.appdata.xml b/share/appdata/torbrowser-launcher.appdata.xml
index 1cbbcef..881c6fb 100644
--- a/share/appdata/torbrowser-launcher.appdata.xml
+++ b/share/appdata/torbrowser-launcher.appdata.xml
@@ -7,18 +7,20 @@
<name>Tor Browser Launcher</name>
<summary>A program to help you download, keep updated, and run the Tor Browser Bundle</summary>
<description>
- <p>Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install torbrowser-launcher from your distribution's package manager and it handles everything else, including:</p>
+ <p>Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. It downloads the same TBB from torproject.org that everyone else uses, and it doesn't alter it in any way. But it does make it much more usable, and it makes the task of keeping it up-to-date more secure.</p>
+ <p>You install torbrowser-launcher from your distribution's package manager and it handles everything else, including:</p>
<ul>
<li>Downloading the most recent version of TBB for you, in your language and for your architecture</li>
<li>Automatically updating (while preserving your bookmarks and preferences)</li>
<li>Verifying the TBB's GnuPG signature</li>
<li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li>
- <li>Adding a "Tor Browser" application launcher to your desktop environment's menu, and letting you set Tor Browser as your default browser</li>
+ <li>Adding a Tor Browser application launcher to your desktop environment's menu</li>
+ <li>Lets you set Tor Browser as your default browser</li>
<li>Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)</li>
</ul>
</description>
<screenshots>
- <screenshot>
+ <screenshot type="default">
<image>https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/screenshot.png</image>
<caption>Window to change Tor Browser Launcher settings</caption>
</screenshot>
commit c0ddded7c8105dd273cc0186fd210eaf5d59c145
Author: Micah Lee <micah@micahflee.com>
Date: Tue Nov 25 12:39:42 2014 -0800
added an AppData xml file (#144)
diff --git a/share/appdata/torbrowser-launcher.appdata.xml b/share/appdata/torbrowser-launcher.appdata.xml
new file mode 100644
index 0000000..1cbbcef
--- /dev/null
+++ b/share/appdata/torbrowser-launcher.appdata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Micah Lee <micah@micahflee.com> -->
+<application>
+ <id type="desktop">torbrowser-launcher.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>MIT</project_license>
+ <name>Tor Browser Launcher</name>
+ <summary>A program to help you download, keep updated, and run the Tor Browser Bundle</summary>
+ <description>
+ <p>Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install torbrowser-launcher from your distribution's package manager and it handles everything else, including:</p>
+ <ul>
+ <li>Downloading the most recent version of TBB for you, in your language and for your architecture</li>
+ <li>Automatically updating (while preserving your bookmarks and preferences)</li>
+ <li>Verifying the TBB's GnuPG signature</li>
+ <li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li>
+ <li>Adding a "Tor Browser" application launcher to your desktop environment's menu, and letting you set Tor Browser as your default browser</li>
+ <li>Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)</li>
+ </ul>
+ </description>
+ <screenshots>
+ <screenshot>
+ <image>https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/screenshot.png</image>
+ <caption>Window to change Tor Browser Launcher settings</caption>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">https://github.com/micahflee/torbrowser-launcher</url>
+ <updatecontact>micah@micahflee.com</updatecontact>
+</application>
commit f96aefc8f775b58609994cf451ddf8e2284d4b17
Author: Micah Lee <micah@micahflee.com>
Date: Tue Nov 25 12:39:22 2014 -0800
updated readme, package description
diff --git a/README.md b/README.md
index 1679f33..364dfe6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+
+
# Tor Browser Launcher
Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install ```torbrowser-launcher``` from your distribution's package manager and it handles everything else, including:
@@ -6,14 +8,14 @@ Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to
* Automatically updating (while preserving your bookmarks and preferences)
* Verifying the TBB's [GnuPG signature](http://www.gnupg.org/gph/en/manual/x135.html)
* Includes AppArmor profiles to make a Tor Browser compromise not as bad
-* Adding a "Tor Browser" application launcher to your desktop environment's menu
+* Adding a "Tor Browser" application launcher to your desktop environment's menu, and letting you set Tor Browser as your default browser
* Optionally playing a modem sound when you open Tor Browser (because Tor is so slow)
-If you use Ubuntu, you can install it now from my PPA (see "Installing in Ubuntu" below). Tor Browser Launcher will be included in the main Ubuntu repository in 14.10, and is included is Debian Jessie. To install it in any other distribution, see the [build instructions](/BUILD.md).
+Tor Browser Launcher is included in Ubuntu 14.10+, Debian 8+, and Fedora 20+. To install it in any other distribution, see the [build instructions](/BUILD.md).
You might want to check out the [security design doc](/security_design.md).
-## Installing in Ubuntu
+## Installing in Ubuntu 14.04 and earlier
I've created a PPA where I'm maintaining torbrowser-launcher binaries. You can install in an Ubuntu-based distribution like this:
diff --git a/setup.py b/setup.py
index 803ae88..0e47152 100644
--- a/setup.py
+++ b/setup.py
@@ -68,11 +68,9 @@ setup(
license='MIT',
description='A program to help you download, keep updated, and run the Tor Browser Bundle',
long_description="""
-Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install torbrowser-launcher from your distribution's package manager and it handles downloading the most recent version of TBB for you, in your language and for your architecture. It also adds a "Tor Browser" application launcher to your operating system's menu.
+Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to maintain and use for GNU/Linux users. You install torbrowser-launcher from your distribution's package manager and it handles downloading the most recent version of TBB for you, in your language and for your architecture. It also adds a "Tor Browser" application launcher to your operating system's menu, and lets you set Tor Browser as your default web browser.
-When you first launch Tor Browser Launcher, it will download TBB from https://www.torproject.org/ and extract it in ~/.torproject, and then execute it. When you run it after that it will just execute TBB.
-
-Tor Browser Launcher will get updated each time a new version of TBB is released. When you open Tor Browser after an update, it will download the newer version of TBB for you and extract it over your old TBB directory in ~/.torproject, so you will maintain your TBB bookmarks.
+When you first launch Tor Browser Launcher, it will download TBB from https://www.torproject.org/, extract it in your home directory, and execute it. When you run it after that it will just execute TBB. When you open Tor Browser after an update, it will download the newer version of TBB for you and extract it over your old TBB directory, so you will maintain your TBB bookmarks and always be running the latest version.
""",
packages=['torbrowser_launcher'],
scripts=['torbrowser-launcher'],
commit 76f278f78c1778a0b1c86c8e33e7f1a8afce72e8
Author: Micah Lee <micah@micahflee.com>
Date: Tue Nov 25 12:19:01 2014 -0800
adding a screenshot for TBL
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000..0cad75e
Binary files /dev/null and b/screenshot.png differ
commit 4356d449cbae920550dcae9fc6de9d8a151b8414
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 24 22:58:00 2014 -0800
updating .desktop to handle http and https schemas
diff --git a/share/applications/torbrowser.desktop b/share/applications/torbrowser.desktop
index fbd040d..4e10d3f 100644
--- a/share/applications/torbrowser.desktop
+++ b/share/applications/torbrowser.desktop
@@ -1,8 +1,9 @@
[Desktop Entry]
Name=Tor Browser
Comment=Launch the Tor Browser Bundle
-Exec=/usr/bin/torbrowser-launcher
+Exec=/usr/bin/torbrowser-launcher %u
Terminal=false
Type=Application
Icon=/usr/share/pixmaps/torbrowser80.xpm
Categories=Network;WebBrowser;
+MimeType=x-scheme-handler/http;x-scheme-handler/https;
commit 028bc225ace555adc3314fa95751d29659a14778
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 24 22:53:05 2014 -0800
you can pass URLs into torbrowser-launcher now (#103)
diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
index 224ace8..5807117 100644
--- a/torbrowser_launcher/__init__.py
+++ b/torbrowser_launcher/__init__.py
@@ -36,9 +36,11 @@ def main():
# parse arguments
parser = argparse.ArgumentParser()
parser.add_argument('--settings', action='store_true', dest='settings', help='Open Tor Browser Launcher settings')
+ parser.add_argument('url', nargs='*', help='URL to load')
args = parser.parse_args()
settings = bool(args.settings)
+ url_list = args.url
# load the version and print the banner
with open(os.path.join(SHARE, 'version')) as buf:
@@ -58,15 +60,13 @@ def main():
common.bring_window_to_front(tbl_pid)
sys.exit()
-
-
if settings:
# settings mode
app = Settings(common)
else:
# launcher mode
- app = Launcher(common)
+ app = Launcher(common, url_list)
if __name__ == "__main__":
main()
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index cca60cd..284f224 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -63,9 +63,10 @@ class VerifyTorProjectCert(ClientContextFactory):
return cert.digest('sha256') == self.torproject_ca.digest('sha256')
class Launcher:
- def __init__(self, common):
+ def __init__(self, common, url_list):
print _('Starting launcher dialog')
self.common = common
+ self.url_list = url_list
# init launcher
self.set_gui(None, '', [])
@@ -633,7 +634,10 @@ class Launcher:
gtk.main_iteration_do(True)
# run Tor Browser
- subprocess.call([self.common.paths['tbb']['start']])
+ if len(self.url_list) == 0:
+ subprocess.call([self.common.paths['tbb']['start']])
+ else:
+ subprocess.call([self.common.paths['tbb']['start'], '-allow-remote'] + self.url_list)
if run_next_task:
self.run_task()
commit 013584d9e63f116ecd7de69116ccd6c2cb4a5c9c
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 24 22:39:56 2014 -0800
switched to using argparse to parse arguements, and made settings open with "--settings" instead of "-settings"
diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
index cadf71b..3157823 100644
--- a/share/applications/torbrowser-settings.desktop
+++ b/share/applications/torbrowser-settings.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Tor Browser Settings
Comment=Tor Browser Launcher Settings
-Exec=/usr/bin/torbrowser-launcher -settings
+Exec=/usr/bin/torbrowser-launcher --settings
Terminal=false
Type=Application
Icon=/usr/share/pixmaps/torbrowser80.xpm
diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
index efcaedc..224ace8 100644
--- a/torbrowser_launcher/__init__.py
+++ b/torbrowser_launcher/__init__.py
@@ -26,13 +26,21 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
"""
-import os, sys
+import os, sys, argparse
from common import Common, SHARE
from settings import Settings
from launcher import Launcher
def main():
+ # parse arguments
+ parser = argparse.ArgumentParser()
+ parser.add_argument('--settings', action='store_true', dest='settings', help='Open Tor Browser Launcher settings')
+ args = parser.parse_args()
+
+ settings = bool(args.settings)
+
+ # load the version and print the banner
with open(os.path.join(SHARE, 'version')) as buf:
tor_browser_launcher_version = buf.read().strip()
@@ -50,7 +58,9 @@ def main():
common.bring_window_to_front(tbl_pid)
sys.exit()
- if '-settings' in sys.argv:
+
+
+ if settings:
# settings mode
app = Settings(common)
commit d89fe1ed1ea9d861651758ecf070b5d75c1bf5b0
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 24 22:37:55 2014 -0800
only hide window if there is a window to hide (#151)
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index c0af93a..cca60cd 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -627,9 +627,10 @@ class Launcher:
t.start()
# hide the TBL window (#151)
- self.window.hide()
- while gtk.events_pending():
- gtk.main_iteration_do(True)
+ if hasattr(self, 'window'):
+ self.window.hide()
+ while gtk.events_pending():
+ gtk.main_iteration_do(True)
# run Tor Browser
subprocess.call([self.common.paths['tbb']['start']])
commit 99fac15206da6d71f5c150ecd7f1d3fcce34d572
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 24 22:19:55 2014 -0800
hides TBL window before launching TBB (#151)
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index 4a3830d..c0af93a 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -626,6 +626,11 @@ class Launcher:
t = threading.Thread(target=play_modem_sound)
t.start()
+ # hide the TBL window (#151)
+ self.window.hide()
+ while gtk.events_pending():
+ gtk.main_iteration_do(True)
+
# run Tor Browser
subprocess.call([self.common.paths['tbb']['start']])
commit 1c0babb150961a264520e3018e6951080f11dec7
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 24 21:38:04 2014 -0800
it looks like the linux filter is still necessary after TBB 4.0
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index faad6d2..4a3830d 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -497,9 +497,6 @@ class Launcher:
versions = json.load(open(self.common.paths['update_check_file']))
latest = None
- # TODO: after TBB 4.0 is released, refactor this section
- # to not filter linux versions (#132)
-
# filter linux versions
valid = []
for version in versions:
commit d04ebc782084d9184543b3a801d354d17832fcb7
Merge: e7e120b a90c361
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 17 10:14:36 2014 -0800
Merge branch 'master' of github.com:micahflee/torbrowser-launcher
commit a90c361004a14241b01d56a02a60a36bdf6d802c
Merge: 51fd4ac e5a5ec0
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 17 10:14:26 2014 -0800
Merge pull request #150 from AreYouLoco/master
Polish locale
commit e7e120b83e948b4e9713cc7ff074d43f8fbfa46c
Merge: f338f9e 51fd4ac
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 17 09:46:20 2014 -0800
Merge branch 'master' of github.com:micahflee/torbrowser-launcher
commit 51fd4ac4a5b6ab92bb0595feb8206065134eddbb
Merge: 3a5b481 6e59517
Author: Micah Lee <micah@micahflee.com>
Date: Mon Nov 10 16:56:04 2014 -0800
Merge pull request #146 from isislovecruft/master
Switch to using new Tor Project dist URL.
commit e5a5ec0b5be10e46b6535bcd764a12ffa02c916e
Author: AreYouLoco? <areyouloco@paranoici.org>
Date: Sat Nov 8 20:41:35 2014 +0100
Fix typo in locale/pl/messages.pot
diff --git a/locale/pl/messages.pot b/locale/pl/messages.pot
index 34b1565..8f9163b 100644
--- a/locale/pl/messages.pot
+++ b/locale/pl/messages.pot
@@ -159,4 +159,4 @@ msgstr "Launcher Przeglądarki Tora"
#: torbrowser-launcher:567
msgid "version {0}"
-msgstr "wersja {"
+msgstr "wersja {0}"
commit 6e59517aa720b015d9312d4771eef209a6ee278f
Author: Isis Lovecruft <isis@torproject.org>
Date: Mon Oct 27 20:05:16 2014 +0000
Switch to using new Tor Project dist URL.
If I recall correctly, weasel (Tor Project's volunteer lead sysadmin)
tried to switch everything to using https://dist.torproject.org/ last
week, and then added an Apache redirect from
https://www.torproject.org/dist to https://dist.torproject.org after
discovering that some things were still trying to use the old URL. We
should switch to the new one, so that someday weasel can remove the
redirect.
* CHANGE `default_mirror` to https://dist.torproject.org/
diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index c58a6fe..8ea7545 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -47,7 +47,7 @@ class Common:
self.tbl_version = tbl_version
# initialize the app
- self.default_mirror = 'https://www.torproject.org/dist/'
+ self.default_mirror = 'https://dist.torproject.org/'
self.discover_arch_lang()
self.build_paths()
for d in self.paths['dirs']:
commit f338f9e46428a2de1b294a4948b321f299ddf17d
Author: Micah Lee <micah@micahflee.com>
Date: Fri Oct 17 09:57:56 2014 -0700
version bump to 0.1.7dev
diff --git a/share/torbrowser-launcher/version b/share/torbrowser-launcher/version
index c946ee6..4ac0de4 100644
--- a/share/torbrowser-launcher/version
+++ b/share/torbrowser-launcher/version
@@ -1 +1 @@
-0.1.6
+0.1.7dev
commit 3a5b481932f526d72ba1f910197c9ccb1f6855b7
Author: Micah Lee <micah@micahflee.com>
Date: Thu Oct 16 12:55:30 2014 -0700
use platform.dist() to detect ubuntu instead of subprocessing out to lsb_release
diff --git a/setup.py b/setup.py
index ae0ae5c..803ae88 100644
--- a/setup.py
+++ b/setup.py
@@ -27,11 +27,11 @@ OTHER DEALINGS IN THE SOFTWARE.
"""
from distutils.core import setup
-import os, sys, subprocess
+import os, sys, platform
SHARE = 'share'
# detect linux distribution
-distro = subprocess.check_output(['lsb_release', '-i']).split()[-1]
+distro = platform.dist()[0]
def file_list(path):
files = []
commit a15f3037a977748d961921cfc8a0aec756d6bf8b
Author: AreYouLoco? <areyouloco@paranoici.org>
Date: Sun May 4 04:35:15 2014 +0200
Added Polish locale.
diff --git a/locale/pl/messages.pot b/locale/pl/messages.pot
new file mode 100644
index 0000000..34b1565
--- /dev/null
+++ b/locale/pl/messages.pot
@@ -0,0 +1,162 @@
+# Tor Browser Launcher
+# Copyright (C) 2013 Micah Lee <micah@micahflee.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1\n"
+"POT-Creation-Date: 2013-04-03 10:49+PDT\n"
+"PO-Revision-Date: 2014-05-02 20:41+0100\n"
+"Last-Translator: AreYouLoco? <areyouloco@paranoici.org>\n"
+"Language-Team: none\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: torbrowser-launcher:70
+msgid "Checking for Tor Browser update."
+msgstr "Sprawdzanie aktualizacji dla Przeglądarki Tora."
+
+#: torbrowser-launcher:76
+msgid "Checked for update within 24 hours, skipping"
+msgstr "Sprawdzono aktualizacje w przeciągu ostatnich 24 godzin, pomijanie"
+
+#: torbrowser-launcher:80
+msgid "Error loading settings. Delete ~/.torbrowser and try again."
+msgstr "Błąd ładowania ustawień. Usuń ~/.torbrowser i spróbój ponownie."
+
+#: torbrowser-launcher:85
+msgid "Tor Browser"
+msgstr "Przeglądarka Tora"
+
+#: torbrowser-launcher:105
+msgid "Your Tor Browser is out of date."
+msgstr "Twoja Przeglądarka Tora jest nieaktualna."
+
+#: torbrowser-launcher:113
+msgid ""
+"Something is wrong. The version of Tor Browser Bundle you have installed is "
+"newer than the current version?"
+msgstr ""
+"Coś poszło nie tak. Wersja Przeglądarki Tora, którą masz zainstalowaną jest "
+"nowsza od aktualnej?"
+
+#: torbrowser-launcher:120
+msgid "Installing Tor Browser."
+msgstr "Instalowanie Przeglądarki Tora."
+
+#: torbrowser-launcher:127
+msgid "Downloading and installing Tor Browser."
+msgstr "Pobieranie i instalowanie Przeglądarki Tora."
+
+#: torbrowser-launcher:166
+msgid "Error creating {0}"
+msgstr "Błąd przy tworzeniu {0}"
+
+#: torbrowser-launcher:168 torbrowser-launcher:215
+msgid "{0} is not writable"
+msgstr "{0} jest tylko do odczytu"
+
+#: torbrowser-launcher:212
+msgid "Cannot create directory {0}"
+msgstr "Nie można stworzyć {0}"
+
+#: torbrowser-launcher:222
+msgid "Creating GnuPG homedir"
+msgstr "Tworzenie katalogu głównego GnuPG"
+
+#: torbrowser-launcher:225
+msgid "Importing keys"
+msgstr "Importowanie kluczy"
+
+#: torbrowser-launcher:345 torbrowser-launcher:353 torbrowser-launcher:357
+msgid "Downloading"
+msgstr "Pobieranie"
+
+#: torbrowser-launcher:349
+msgid "Checking to see if update is needed"
+msgstr "Sprawdzanie czy potrzebna jest aktualizacja"
+
+#: torbrowser-launcher:361
+msgid "Verifying signature"
+msgstr "Weryfikowanie podpisu"
+
+#: torbrowser-launcher:365
+msgid "Extracting"
+msgstr "Rozpakowywanie"
+
+#: torbrowser-launcher:369
+msgid "Running"
+msgstr "Uruchamianie"
+
+#: torbrowser-launcher:373
+msgid "Starting download over again"
+msgstr "Ponowne rozpoczynanie pobierania"
+
+#: torbrowser-launcher:398
+msgid "Downloaded"
+msgstr "Pobrano"
+
+#: torbrowser-launcher:401
+msgid "Finished receiving body:"
+msgstr "Zakończono odbieranie głównej części:"
+
+#: torbrowser-launcher:418
+msgid "Download error"
+msgstr "Błąd pobierania"
+
+#: torbrowser-launcher:419
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Are you connected to the internet?"
+msgstr ""
+"Błąd przy rozpoczynaniu pobierania:\n"
+"\n"
+"{0}\n"
+"\n"
+"Czy jesteś podłąćzony do internetu?"
+
+#: torbrowser-launcher:426
+msgid "Downloading {0}"
+msgstr "Pobieranie {0}"
+
+#: torbrowser-launcher:461 torbrowser-launcher:465
+msgid "Error checking for updates."
+msgstr "Błąd przy sprawdzaniu aktualizacji."
+
+#: torbrowser-launcher:474
+msgid "Verifying Signature"
+msgstr "Weryfikowanie Podpisu"
+
+#: torbrowser-launcher:483
+msgid ""
+"SIGNATURE VERIFICATION FAILED!\n"
+"\n"
+"You might be under attack, or there might just be a networking problem. "
+"Click Start try the download again."
+msgstr ""
+"WERYFIKACJA PODPISU NIEUDANA!\n"
+"\n"
+"Możesz być atakowany, lub mogą być to tylko problemy z połączeniem. Naciśnij "
+"Start aby pobrać ponownie."
+
+#: torbrowser-launcher:493
+msgid "Installing"
+msgstr "Instalowanie"
+
+#: torbrowser-launcher:519
+msgid "Downloading Tor Browser Bundle over again."
+msgstr "Ponowne pobieranie Tor Browser Bundle"
+
+#: torbrowser-launcher:566
+msgid "Tor Browser Launcher"
+msgstr "Launcher Przeglądarki Tora"
+
+#: torbrowser-launcher:567
+msgid "version {0}"
+msgstr "wersja {"
Attachment:
signature.asc
Description: This is a digitally signed message part.