Fixes for debian packagingv2.0.0

45 files changed, 28 insertions, 41 deletions

diff --git a/DATA_LICENCES.txt b/DATA_LICENCES.txt
new file mode 100644
index 0000000..c9532bc
--- /dev/null
+++ b/DATA_LICENCES.txt
@@ -0,0 +1 @@
+chimere/tests/eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain
diff --git a/MANIFEST.in b/MANIFEST.in
index 565fbbc..7b2ddd9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,7 @@
 include *.txt MANIFEST.in
 include chimere/tests/*
-prune docs/*/build/
-prune example_project/local_settings.py
-include example_project/*.sample
-include docs/*/*.rst Makefile
+prune docs/*/*/build/
+include docs/*/*.rst
 include docs/*/Makefile
 include docs/*/conf.py
 include docs/*/static/*.png
diff --git a/chimere/__init__.py b/chimere/__init__.py
index e8e07a3..81b68e5 100644
--- a/chimere/__init__.py
+++ b/chimere/__init__.py
@@ -1,22 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-"""
-import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings'
+# Copyright (C) 2012-2013  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
-from django.utils.translation import ugettext as _
-
-try:
-    # strings to be considered for translation
-    # templates/chimere/edit.html, templates/chimere/edit_route.html
-    _(u"Multimedia files")
-    _(u"Picture files")
-except ImportError:
-    pass
-"""
-
-VERSION = (2, 0)
+VERSION = (2, 0, 0)
 
 def get_version():
     return u'.'.join((unicode(num) for num in VERSION))
diff --git a/chimere/static/chimere/img/cloud-popup-relative.png b/chimere/static/chimere/img/cloud-popup-relative.png
index 1215a36..1215a36 100755..100644
--- a/chimere/static/chimere/img/cloud-popup-relative.png
+++ b/chimere/static/chimere/img/cloud-popup-relative.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
index e5a047c..e5a047c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
index 50820ee..50820ee 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
index fb8c0f8..fb8c0f8 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
index 7b50aff..7b50aff 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
index 50820ee..50820ee 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
index 4fe3547..4fe3547 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
index e809c3b..e809c3b 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
index 0812542..0812542 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
index a9be3b2..a9be3b2 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
index 277c87a..277c87a 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
index 76e50d0..76e50d0 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
index 8b110ba..8b110ba 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif
index 7ac990c..7ac990c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png
index 660a254..660a254 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
index 7ac990c..7ac990c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
index 7f28379..7f28379 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
index b28c1ef..b28c1ef 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
index e0cd9c4..e0cd9c4 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif
index 2b1280f..2b1280f 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif
index 7ac990c..7ac990c 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif
diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png
index 4fe3547..4fe3547 100755..100644
--- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png
+++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png
diff --git a/chimere/tests/data_license b/chimere/tests/data_license
deleted file mode 100644
index bee3231..0000000
--- a/chimere/tests/data_license
+++ /dev/null
@@ -1 +0,0 @@
-eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain
diff --git a/chimere/utils.py b/chimere/utils.py
index d1ea851..a82d88b 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -46,6 +46,8 @@ from chimere import get_version
 from external_utils import OsmApi
 
 def unicode_normalize(string):
+    if type(string) == str:
+        string = unicode(string.decode('utf-8'))
     return ''.join(
         (c for c in unicodedata.normalize('NFD', string)
         if unicodedata.category(c) != 'Mn'))
diff --git a/debian/changelog b/debian/changelog
index 5e26b37..cf9c12f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-django-chimere (2.0.0) unstable; urgency=low
+python-django-chimere (2.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #699579)
 
diff --git a/debian/control b/debian/control
index 2dc9e52..0dc442c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: python-django-chimere
 Section: python
 Priority: optional
 Maintainer: Étienne Loks <etienne.loks@peacefrogs.net>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0),
+ python | python-all | python-dev | python-all-dev,
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
 Standards-Version: 3.9.3
 Homepage: http://pypi.python.org/pypi/chimere
 #Vcs-Git: git://git.debian.org/collab-maint/python-django-chimere.git
@@ -33,8 +35,7 @@ Description: collaborative and thematic maps application for Django
  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 authentification but are moderated by a team in charge of the
- map.
+ with no authentication but are moderated by a team in charge of the map.
  .
  Main features:
   * Display (by default) of the mapnik OpenStreetMap layer.
@@ -53,11 +54,3 @@ Description: collaborative and thematic maps application for Django
   * Configuration of map layers in administration interface.
   * Import and export of data from/to various formats: ShapeFile, KML, GeoRSS
     (import only), CSV and OpenStreetMap.
-
-Package: python-django-chimere-docs
-Architecture: all
-Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
-Description: python-django-chimere documentation
- This package documents the use and customization of the collaborative and
- thematic maps application for Django Chimère.
diff --git a/debian/copyright b/debian/copyright
index f5939a4..bee08dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ License: MIT or GPL-2
 
 Files: chimere/bsmSelect/*
 Copyright: 2008 Ryan Cramer
-Copyright: 2010 Victor Berchet
+           2010 Victor Berchet
 License: MIT or GPL-2
 
 Files: chimere/prettyPhoto/*
@@ -29,7 +29,7 @@ License: GPL-2
 
 Files: chimere/openlayers/*
 Copyright: 2006-2012 OpenLayers Contributors
-Licence: BSD-2-clause
+License: BSD-2-clause
 
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
@@ -86,7 +86,7 @@ License: GPL-3.0+
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-Licence: BSD-2-clause
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..b7c033a
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,10 @@
+Document: python-django-chimere
+Title: Chimère
+Author: Étienne Loks
+Abstract: This manual describes how to install and use Chimère a web
+ collaborative and thematic maps.
+Section: Data Management
+
+Format: html
+Index: /usr/share/doc/python-django-chimere/html/index.html
+Files: /usr/share/doc/python-django-chimere/html/*.html
diff --git a/debian/docs b/debian/docs
index 2a00185..e953f2c 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,2 @@
 CHANGES.txt
-LICENSE.txt
 README.txt
-README.txt
-requirements.txt
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..bc90d3f
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+django_tinymce python-django-tinymce
diff --git a/debian/watch b/debian/watch
index b7ebbec..a67dad8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-
-http://www.peacefrogs.net/download/chimere/chimere-(.*)\.tar\.bz2
+http://pypi.python.org/packages/source/c/chimere-([0-9a-z.]*)\.tar\.gz
diff --git a/setup.py b/setup.py
index 0e990a4..b7bf65b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     install_requires=reqs,
+    #test_suite = "chimere.runtests.runtests",
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',