Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/static/chimere/css/styles.css
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/utils.py
	chimere/views.py
	example_project/settings.py

1 files changed, 9 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index ca0c460..b7bf65b 100644
--- a/setup.py
+++ b/setup.py
@@ -10,31 +10,23 @@ try:
 except (IOError, OSError):
     reqs = ''
 
-def list_folder(path, extensions):
-    """
-    Recursive function to list folders
-    extensions may be a list like ["css", "js", "html"]
-    """
-    final = []
-    for root, subfolders, filenames in os.walk(path):
-        for subfolder in subfolders:
-            for ext in extensions:
-                final.append("%s/%s/*.%s" % (root[len("chimere/"):], subfolder, ext))
-    return final
-
 setup(
     name='chimere',
     version=chimere.get_version(),
     description=
-    """Chimere is a kind of online “mashup” which is designed to aggregate geographic data from several sources. Chimere gets a map from OpenStreetMap and display other data added by users. Datas are freely submitted by visitors and then validated by an administrator.""",
-    author='Étienne Loks',
+    "Chimere is a kind of online “mashup” which is designed to aggregate "\
+    "geographic data from several sources. Chimere gets a map from "\
+    "OpenStreetMap and display other data added by users. Datas are freely "\
+    "submitted by visitors and then validated by an administrator.",
+    long_description=open('README.txt').read(),
+    author=u'Étienne Loks',
     author_email='etienne.loks@peacefrogs.net',
     url='http://blog.peacefrogs.net/nim/chimere/',
-    packages=find_packages(exclude=["example", "example.*",]),
+    license='GPL v3 licence, see COPYING',
+    packages=find_packages(),
     include_package_data=True,
-    package_data={
-            'chimere': list_folder(os.path.join('chimere', 'static'), ["css", "js", "png"]) + list_folder(os.path.join('chimere', 'templates'), ["html"])},
     install_requires=reqs,
+    #test_suite = "chimere.runtests.runtests",
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',