From 37db11733eafa4b72e0f3d7dbc61e36deb6e3cf5 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 9 May 2013 23:53:27 +0900
Subject: fix pip install

---
 MANIFEST.in                 |  4 +++-
 changes/bug_fix-pip-install |  1 +
 setup.py                    | 16 +++++++++++++---
 src/leap/mx/__init__.py     |  1 +
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 changes/bug_fix-pip-install

diff --git a/MANIFEST.in b/MANIFEST.in
index 07f43b8..6bb33b5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,3 @@
-data/*
\ No newline at end of file
+include data/*
+include pkg/*
+include pkg/utils/*
diff --git a/changes/bug_fix-pip-install b/changes/bug_fix-pip-install
new file mode 100644
index 0000000..fcb5829
--- /dev/null
+++ b/changes/bug_fix-pip-install
@@ -0,0 +1 @@
+  o Fix broken pip install
diff --git a/setup.py b/setup.py
index eb86a25..136d7b4 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
 """
 setup file for leap.mx
 """
+import os
 from setuptools import setup, find_packages
 
 from pkg.utils.reqs import parse_requirements
@@ -36,9 +37,19 @@ trove_classifiers = [
     'Topic :: Security :: Cryptography',
 ]
 
+if os.environ.get("VIRTUAL_ENV", None):
+    data_files = None
+else:
+    # XXX use a script entrypoint for mx instead, it will
+    # be automatically
+    # placed by distutils, using whatever interpreter is
+    # available.
+    data_files = [("/usr/local/bin/", ["mx.tac"]),
+                  ("/etc/init.d/", ["pkg/leap_mx"])]
 setup(
     name='leap.mx',
-    version="0.2.0",
+    version="0.2.1-dev",
+    # bump also src/leap/mx/__init__
     url="http://github.com/leapcode/leap_mx",
     license='AGPLv3+',
     author='The LEAP Encryption Access Project',
@@ -55,6 +66,5 @@ setup(
     #test_suite='leap.mx.tests',
     install_requires=parse_requirements(),
     classifiers=trove_classifiers,
-    data_files = [("/usr/local/bin/", ["mx.tac"]),
-                  ("/etc/init.d/", ["pkg/leap_mx"])]
+    data_files=data_files
 )
diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py
index c10c64d..e8c7a5f 100644
--- a/src/leap/mx/__init__.py
+++ b/src/leap/mx/__init__.py
@@ -17,3 +17,4 @@
 """
 Module initialization file for leap.mx .
 """
+__version__ = "0.2.1-dev"
-- 
cgit v1.2.3