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, 55 insertions, 9 deletions

diff --git a/debian/control b/debian/control
index 1d89b61..71b2461 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,56 @@
+Source: python-django-chimere
+Section: python
+Priority: optional
+Maintainer: Étienne Loks <etienne.loks@peacefrogs.net>
+Build-Depends: debhelper (>= 8.0.0),
+ python | python-all | python-dev | python-all-dev,
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
+ python-setuptools
+Standards-Version: 3.9.3
+Homepage: http://pypi.python.org/pypi/chimere
+#Vcs-Git: git://git.debian.org/collab-maint/python-django-chimere.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/python-django-chimere.git;a=summary
+
 Package: python-django-chimere
-Version: 2.0
-Depends: python-django (>=1.4), python-gdal, python-psycopg2,
-         python-beautifulsoup, python-imaging, libjs-jquery,
-         libjs-jquery-ui, libjs-jquery-ui-theme-base,
-         postgresql-9.1, postgresql-9.1-postgis, gettext,
-         python-simplejson, gpsbabel, python-django-south,
-         python-pyexiv2 python-feedparser javascript-common
-Recommends: tinymce, python-django-celery, python-kombu
-Suggests: libjs-jquery-ui-theme-south-street
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ python-django (>= 1.4),
+ python-django (<< 1.5),
+ python-gdal,
+ python-psycopg2,
+ python-beautifulsoup,
+ python-imaging,
+ python-simplejson,
+ python-django-south,
+ python-pyexiv2,
+ python-feedparser
+Recommends: javascript-common,
+ libjs-jquery,
+ libjs-jquery-ui,
+ libjs-jquery-ui-theme-base,
+ gpsbabel
+Description: collaborative and thematic maps application for Django
+ Chimère is a cartographic mashup using OpenStreetMap as a default map
+ layer. This software aims to create online collaborative and thematic
+ maps. Content (multimedia, text) are associated to basic geographic
+ items (Point Of Interest, routes). Adds on the map are open to everybody
+ with no authentication but are moderated by a team in charge of the map.
+ .
+ Main features:
+  * Display (by default) of the mapnik OpenStreetMap layer.
+  * Display on the map of POIs (with markers) and routes (with colored
+    polylines).
+  * Thematic choices of items to display (POIs and routes).
+  * Filter themes in regard to currently available items.
+  * Display of the detail of a POI (name, description, pictures, multimedia
+    files).
+  * Management of multimedia files and images associated to POIs.
+  * Add of a cartographic item (POI, route) on the map by an user without
+    authentication (the item is only available after moderation).
+  * Admin interface for moderation and configuration.
+  * Cut a Chimère by "areas". Each "area" can have specific themes, a new
+    default center, etc.
+  * Configuration of map layers in administration interface.
+  * Import and export of data from/to various formats: ShapeFile, KML, GeoRSS
+    (import only), CSV and OpenStreetMap.