setup.py: include data files in package_data= with paths relative to src/allmydata...

Remove packages= entries and unneeded __init__.py files for those subdirectories.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/setup.py b/setup.py
index fe52383b8ce01047c87ce8d84d6317aba03a7828..9a3321f93e7d163557f193cbb408fd75520e5c9a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -443,18 +443,17 @@ setup(name=APPNAME,
                 'allmydata.test',
                 'allmydata.util',
                 'allmydata.web',
-                'allmydata.web.static',
-                'allmydata.web.static.css',
                 'allmydata.windows',
                 'buildtest'],
       classifiers=trove_classifiers,
       test_suite="allmydata.test",
       install_requires=install_requires,
       tests_require=tests_require,
-      package_data={"allmydata.web": ["*.xhtml"],
-                    "allmydata.web.static": ["*.js", "*.png", "*.css"],
-                    "allmydata.web.static.css": ["*.css"],
-                    "allmydata.web.static.img": ["*.png"],
+      package_data={"allmydata.web": ["*.xhtml",
+                                      "static/*.js", "static/*.png", "static/*.css",
+                                      "static/img/*.png",
+                                      "static/css/*.css",
+                                      ]
                     },
       setup_requires=setup_requires,
       entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] },

diff --git a/src/allmydata/web/static/__init__.py b/src/allmydata/web/static/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/allmydata/web/static/css/__init__.py b/src/allmydata/web/static/css/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/allmydata/web/static/img/__init__.py b/src/allmydata/web/static/img/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000