From 5ff29dc57e2877a14e705d09b7042cddf4165d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 6 Mar 2013 15:27:23 -0300
Subject: Remove everything to start from scratch

---
 src/leap/__init__.py | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 src/leap/__init__.py

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
deleted file mode 100644
index 2adbb34a..00000000
--- a/src/leap/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-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, soledad]
-
-__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 = {}
-- 
cgit v1.2.3


From a6afbf7b848030573f01480bce0959626330b02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 6 Mar 2013 15:44:53 -0300
Subject: Add general app

---
 src/leap/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/leap/__init__.py

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
new file mode 100644
index 00000000..e69de29b
-- 
cgit v1.2.3


From 235de1cc59756ebf92100a824a95ed1a6fb29c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 8 Mar 2013 14:35:34 -0300
Subject: Add version handling

---
 src/leap/__init__.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index e69de29b..44235c7c 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -0,0 +1,29 @@
+"""
+LEAP Encryption Access Project
+website: U{https://leap.se/}
+"""
+
+__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 = {}
-- 
cgit v1.2.3


From d0dfad6ac2af360de6421ce74a6831b5b81ad019 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 14 Mar 2013 07:08:31 +0900
Subject: namespace leap + leap.common split

leap is a namespace package from here on.
common folder will be deleted and moved to leap_pycommon repository.
---
 src/leap/__init__.py | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'src/leap/__init__.py')

diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 44235c7c..f48ad105 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,29 +1,6 @@
-"""
-LEAP Encryption Access Project
-website: U{https://leap.se/}
-"""
-
-__version__ = "unknown"
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
 try:
-    from ._version import get_versions
-    __version__ = get_versions()['version']
-    del get_versions
+    __import__('pkg_resources').declare_namespace(__name__)
 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 = {}
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
-- 
cgit v1.2.3