From e876e23917788b77a5954eef740112cf3dba7cbf Mon Sep 17 00:00:00 2001
From: Dean Malmgren <dean.malmgren@datascopeanalytics.com>
Date: Mon, 3 Dec 2012 17:08:28 -0600
Subject: [PATCH] more mucking around with setup.py and MANIFEST

---
 MANIFEST.in      |  3 ---
 flux/__init__.py |  2 +-
 setup.py         | 21 +++++++++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 6ca4084..79b61b2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,9 +5,6 @@ include LICENSE.rst
 recursive-include flux/static *
 recursive-include flux/fixtures *
 recursive-include flux/templates *
-#recursive-include flux/management *
-#recursive-include flux/management/commands *
-#recursive-include flux *
 recursive-exclude * *.py[co]
 recursive-exclude * *~ 
 recursive-exclude * *.orig
diff --git a/flux/__init__.py b/flux/__init__.py
index 0a8da88..3dc1f76 100644
--- a/flux/__init__.py
+++ b/flux/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.0"
diff --git a/setup.py b/setup.py
index 52338e9..df62fbc 100644
--- a/setup.py
+++ b/setup.py
@@ -31,9 +31,12 @@ def fullsplit(path, result=None):
         if package:
             dependencies.append(package)
 
-# get a list of all the packages to include in scr_dir
+# get a list of all the packages to include in scr_dir. inspiration
+# from the django setup.py
 src_dir = 'flux'
-packages, data_files = [], []
+packages = []
+#data_files = []
+package_data = {src_dir:[]}
 for dirpath, dirnames, filenames in os.walk(src_dir):
     for i, dirname in enumerate(dirnames):
         if dirname.startswith('.') or dirname == '__pycache__':
@@ -41,8 +44,10 @@ def fullsplit(path, result=None):
     if '__init__.py' in filenames:
         packages.append('.'.join(fullsplit(dirpath)))
     elif filenames:
-        data_files.append([dirpath, 
-                           [os.path.join(dirpath, f) for f in filenames]])
+        # data_files.append([dirpath, 
+        #                    [os.path.join(dirpath, f) for f in filenames]])
+        package_data[src_dir].extend([os.path.join(dirpath, f) 
+                                      for f in filenames])
 
 setup(
     name="django-flux",
@@ -53,8 +58,12 @@ def fullsplit(path, result=None):
     author_email="dean.malmgren@datascopeanalytics.com",
     license="MIT, see LICENSE.rst",
     url="http://github.com/deanmalmgren/django-flux",
+    download_url="http://github.com/deanmalmgren/django-flux/archives/master",
     install_requires=dependencies,
     packages=packages,
-    # install_package_data=True,
-    data_files=data_files,
+    package_data=package_data,
+
+    # # data files are installed on the system path. for details see
+    # # http://docs.python.org/2/distutils/setupscript.html#installing-additional-files
+    # data_files=data_files,
 )