[Pkg-privacy-commits] [torbrowser-launcher] 184/476: DRYing up versioning, so I only need to update version in one place

[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 46cba61c1b04126cd9b107132b6bb9a234aeff9f
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Jan 2 16:25:50 2014 -0800

    DRYing up versioning, so I only need to update version in one place
---
 build_and_install.sh | 4 +++-
 setup.py             | 6 ++++--
 torbrowser-launcher  | 2 +-
 version              | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build_and_install.sh b/build_and_install.sh
index 23e9b07..e750a8b 100755
--- a/build_and_install.sh
+++ b/build_and_install.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+VERSION=`cat version`
+
 # to clean up from last time, run this:
 # rm -rf ~/.torbrowser
 
@@ -10,5 +12,5 @@ rm -r deb_dist
 python setup.py --command-packages=stdeb.command bdist_deb
 
 # install it
-sudo dpkg -i deb_dist/torbrowser-launcher_0.0.7-1_all.deb
+sudo dpkg -i deb_dist/torbrowser-launcher_$VERSION-1_all.deb
 
diff --git a/setup.py b/setup.py
index 664f03e..b687808 100644
--- a/setup.py
+++ b/setup.py
@@ -36,8 +36,10 @@ def file_list(path):
             files.append(path+'/'+filename)
     return files
 
+version = open('version').read().strip()
+
 setup(name='torbrowser-launcher',
-      version='0.0.7',
+      version=version,
       author='Micah Lee',
       author_email='micah at micahflee.com',
       url='https://www.github.com/micahflee/torbrowser-launcher',
@@ -56,7 +58,7 @@ Tor Browser Launcher will get updated each time a new version of TBB is released
       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']),
+                  ('/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']),
 
diff --git a/torbrowser-launcher b/torbrowser-launcher
index f4195c5..30544bd 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -1160,7 +1160,7 @@ class TBLLauncher:
             reactor.stop()
 
 if __name__ == "__main__":
-    tor_browser_launcher_version = '0.0.7'
+    tor_browser_launcher_version = open('/usr/share/torbrowser-launcher/version').read().strip()
 
     print _('Tor Browser Launcher')
     print _('By Micah Lee, licensed under GPLv3')
diff --git a/version b/version
new file mode 100644
index 0000000..5a5831a
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+0.0.7

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