actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)

1 files changed, 30 insertions, 0 deletions

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index a7ae10e3..0e880867 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,5 +1,35 @@
+"""
+LEAP Encryption Access Project
+website: U{https://leap.se/}
+"""
+
 from leap import eip
 from leap import baseapp
 from leap import util
+#from leap import soledad
 
 __all__ = [eip, baseapp, util]
+__version__ = "unknown"
+try:
+    from ._version import get_versions
+    __version__ = get_versions()['version']
+    del get_versions
+except ImportError:
+    #running on a tree that has not run
+    #the setup.py setver
+    pass
+
+__appname__ = "unknown"
+try:
+    from leap._appname import __appname__
+except ImportError:
+    #running on a tree that has not run
+    #the setup.py setver
+    pass
+
+__full_version__ = __appname__ + '/' + str(__version__)
+
+try:
+    from leap._branding import BRANDING as __branding
+except ImportError:
+    __branding = {}