[Pkg-privacy-commits] [torbrowser-launcher] 218/476: share/ reorganized + setup.py

[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 900e72fc014a2ba1df8ffc94cbc08ab559ddc24d
Author: boyska <piuttosto at logorroici.org>
Date:   Mon Jun 23 01:10:54 2014 +0200

    share/ reorganized + setup.py
---
 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
 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
 16 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index eb989d1..5184924 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 from distutils.core import setup
 import os
+SHARE = 'share'
+PREFIX = '/usr'
+
 
 def file_list(path):
     files = []
@@ -36,7 +39,14 @@ def file_list(path):
             files.append(path+'/'+filename)
     return files
 
-version = open('version').read().strip()
+with open(os.path.join(SHARE, 'torbrowser-launcher/version')) as buf:
+    version = buf.read().strip()
+
+datafiles = []
+for root, dirs, files in os.walk(SHARE):
+    datafiles.append((os.path.join(PREFIX, root),
+                      [os.path.join(root, f) for f in files]))
+
 
 setup(name='torbrowser-launcher',
       version=version,
@@ -52,13 +62,9 @@ Tor Browser Launcher is intended to make the Tor Browser Bundle (TBB) easier to
 
 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. 
+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.
 """,
 
       scripts=['torbrowser-launcher'],
-      data_files=[('/usr/share/applications', ['torbrowser.desktop', 'torbrowser-settings.desktop']),
-                  ('/usr/share/pixmaps', ['img/torbrowser32.xpm', 'img/torbrowser80.xpm']),
-                  ('/usr/share/torbrowser-launcher', ['keys/erinn.asc', 'keys/sebastian.asc', 'keys/alexandre.asc', 'keys/mike.asc', 'keys/mike-2013-09.asc', 'torproject.pem', 'mirrors.txt', 'modem.ogg', 'version']),
-                  ('/usr/share/torbrowser-launcher/locale/en', ['locale/en/messages.pot']),
-                  ('/etc/apparmor.d/', ['apparmor/torbrowser.Browser.firefox', 'apparmor/torbrowser.start-tor-browser', 'apparmor/torbrowser.Tor.tor', 'apparmor/usr.bin.torbrowser-launcher'])]
+      data_files=datafiles
       )
diff --git a/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
similarity index 100%
rename from torbrowser-settings.desktop
rename to share/applications/torbrowser-settings.desktop
diff --git a/torbrowser.desktop b/share/applications/torbrowser.desktop
similarity index 100%
rename from torbrowser.desktop
rename to share/applications/torbrowser.desktop
diff --git a/img/torbrowser32.xpm b/share/pixmaps/torbrowser32.xpm
similarity index 100%
rename from img/torbrowser32.xpm
rename to share/pixmaps/torbrowser32.xpm
diff --git a/img/torbrowser80.xpm b/share/pixmaps/torbrowser80.xpm
similarity index 100%
rename from img/torbrowser80.xpm
rename to share/pixmaps/torbrowser80.xpm
diff --git a/keys/alexandre.asc b/share/torbrowser-launcher/alexandre.asc
similarity index 100%
rename from keys/alexandre.asc
rename to share/torbrowser-launcher/alexandre.asc
diff --git a/keys/erinn.asc b/share/torbrowser-launcher/erinn.asc
similarity index 100%
rename from keys/erinn.asc
rename to share/torbrowser-launcher/erinn.asc
diff --git a/locale/en/messages.pot b/share/torbrowser-launcher/locale/en/messages.pot
similarity index 100%
rename from locale/en/messages.pot
rename to share/torbrowser-launcher/locale/en/messages.pot
diff --git a/locale/nl_NL/messages.pot b/share/torbrowser-launcher/locale/nl_NL/messages.pot
similarity index 100%
rename from locale/nl_NL/messages.pot
rename to share/torbrowser-launcher/locale/nl_NL/messages.pot
diff --git a/locale/pl/messages.pot b/share/torbrowser-launcher/locale/pl/messages.pot
similarity index 100%
rename from locale/pl/messages.pot
rename to share/torbrowser-launcher/locale/pl/messages.pot
diff --git a/keys/mike-2013-09.asc b/share/torbrowser-launcher/mike-2013-09.asc
similarity index 100%
rename from keys/mike-2013-09.asc
rename to share/torbrowser-launcher/mike-2013-09.asc
diff --git a/keys/mike.asc b/share/torbrowser-launcher/mike.asc
similarity index 100%
rename from keys/mike.asc
rename to share/torbrowser-launcher/mike.asc
diff --git a/modem.ogg b/share/torbrowser-launcher/modem.ogg
similarity index 100%
rename from modem.ogg
rename to share/torbrowser-launcher/modem.ogg
diff --git a/keys/sebastian.asc b/share/torbrowser-launcher/sebastian.asc
similarity index 100%
rename from keys/sebastian.asc
rename to share/torbrowser-launcher/sebastian.asc
diff --git a/torproject.pem b/share/torbrowser-launcher/torproject.pem
similarity index 100%
rename from torproject.pem
rename to share/torbrowser-launcher/torproject.pem
diff --git a/version b/share/torbrowser-launcher/version
similarity index 100%
rename from version
rename to share/torbrowser-launcher/version

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