From c1849fefc55b9cfa6a2df55ad9aec92560d1c05d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 3 Feb 2013 14:34:19 +0100 Subject: First work on Debian packaging. * first version of debian specific files to build the package * fix requirements * precise licence of external library --- debian/changelog | 5 +++ debian/compat | 1 + debian/control | 71 ++++++++++++++++++++++++++++---- debian/copyright | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ debian/docs | 5 +++ debian/rules | 22 ++++++++++ debian/source/format | 1 + debian/watch | 3 ++ 8 files changed, 212 insertions(+), 9 deletions(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..5e26b37 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-django-chimere (2.0.0) unstable; urgency=low + + * Initial release (Closes: #699579) + + -- Étienne Loks Sat, 02 Feb 2013 00:51:40 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control index 1d89b61..2dc9e52 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,63 @@ +Source: python-django-chimere +Section: python +Priority: optional +Maintainer: Étienne Loks +Build-Depends: debhelper (>= 8.0.0) +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, + tinymce +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 authentification 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. + +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 new file mode 100644 index 0000000..f5939a4 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,113 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: chimere +Source: http://pypi.python.org/pypi/chimere + +Files: * +Copyright: 2013 Étienne Loks +License: GPL-3.0+ + +Files: debian/* +Copyright: 2013 Étienne Loks +License: GPL-3.0+ + +Files: chimere/external_utils/OsmApi.py +Copyright: 2009-2010 Étienne Chové +License: GPL-3.0+ + +Files: chimere/jme/* +Copyright: 2010 Alexander Farkas +License: MIT or GPL-2 + +Files: chimere/bsmSelect/* +Copyright: 2008 Ryan Cramer +Copyright: 2010 Victor Berchet +License: MIT or GPL-2 + +Files: chimere/prettyPhoto/* +Copyright: 2012 Stephane Caron +License: GPL-2 + +Files: chimere/openlayers/* +Copyright: 2006-2012 OpenLayers Contributors +Licence: BSD-2-clause + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full license can be found at + "/usr/share/common-licenses/GPL-2". + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + 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 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY OPENLAYERS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + . + The views and conclusions contained in the software and documentation are those + of the authors and should not be interpreted as representing official policies, + either expressed or implied, of OpenLayers Contributors. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..2a00185 --- /dev/null +++ b/debian/docs @@ -0,0 +1,5 @@ +CHANGES.txt +LICENSE.txt +README.txt +README.txt +requirements.txt diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..5d9478f --- /dev/null +++ b/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PYTHON2=$(shell pyversions -vr) + +# Prevent setuptools/distribute from accessing the internet. +export http_proxy = http://127.0.9.1:9 + +%: + dh $@ --with python2,sphinxdoc + +override_dh_installdocs: + python setup.py build_sphinx --source-dir=docs/en/ + dh_installdocs build/sphinx/html + +override_dh_auto_clean: + dh_auto_clean + rm -rf build + rm -rf *.egg-info diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..b7ebbec --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.peacefrogs.net/download/chimere/chimere-(.*)\.tar\.bz2 -- cgit v1.2.3 From 32dc52d8194afd9454990ab3ec21ab2f152121d2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 4 Feb 2013 22:59:44 +0100 Subject: Fixes for debian packaging --- DATA_LICENCES.txt | 1 + MANIFEST.in | 6 ++---- chimere/__init__.py | 18 ++---------------- chimere/static/chimere/img/cloud-popup-relative.png | Bin .../images/prettyPhoto/dark_rounded/btnNext.png | Bin .../images/prettyPhoto/dark_rounded/btnPrevious.png | Bin .../prettyPhoto/dark_rounded/contentPattern.png | Bin .../prettyPhoto/dark_rounded/default_thumbnail.gif | Bin .../images/prettyPhoto/dark_rounded/loader.gif | Bin .../images/prettyPhoto/dark_rounded/sprite.png | Bin .../images/prettyPhoto/dark_square/btnNext.png | Bin .../images/prettyPhoto/dark_square/btnPrevious.png | Bin .../images/prettyPhoto/dark_square/contentPattern.png | Bin .../prettyPhoto/dark_square/default_thumbnail.gif | Bin .../images/prettyPhoto/dark_square/loader.gif | Bin .../images/prettyPhoto/dark_square/sprite.png | Bin .../images/prettyPhoto/facebook/btnNext.png | Bin .../images/prettyPhoto/facebook/btnPrevious.png | Bin .../prettyPhoto/facebook/contentPatternBottom.png | Bin .../prettyPhoto/facebook/contentPatternLeft.png | Bin .../prettyPhoto/facebook/contentPatternRight.png | Bin .../images/prettyPhoto/facebook/contentPatternTop.png | Bin .../images/prettyPhoto/facebook/default_thumbnail.gif | Bin .../images/prettyPhoto/facebook/loader.gif | Bin .../images/prettyPhoto/facebook/sprite.png | Bin .../images/prettyPhoto/light_rounded/btnNext.png | Bin .../images/prettyPhoto/light_rounded/btnPrevious.png | Bin .../prettyPhoto/light_rounded/default_thumbnail.gif | Bin .../images/prettyPhoto/light_rounded/loader.gif | Bin .../images/prettyPhoto/light_rounded/sprite.png | Bin .../images/prettyPhoto/light_square/btnNext.png | Bin .../images/prettyPhoto/light_square/btnPrevious.png | Bin .../prettyPhoto/light_square/default_thumbnail.gif | Bin .../images/prettyPhoto/light_square/loader.gif | Bin .../images/prettyPhoto/light_square/sprite.png | Bin chimere/tests/data_license | 1 - chimere/utils.py | 2 ++ debian/changelog | 2 +- debian/control | 15 ++++----------- debian/copyright | 6 +++--- debian/doc-base | 10 ++++++++++ debian/docs | 3 --- debian/pydist-overrides | 1 + debian/watch | 3 +-- setup.py | 1 + 45 files changed, 28 insertions(+), 41 deletions(-) create mode 100644 DATA_LICENCES.txt mode change 100755 => 100644 chimere/static/chimere/img/cloud-popup-relative.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif mode change 100755 => 100644 chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png delete mode 100644 chimere/tests/data_license create mode 100644 debian/doc-base create mode 100644 debian/pydist-overrides (limited to 'debian') 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 -""" -import os -os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings' +# Copyright (C) 2012-2013 Étienne Loks -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 old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif old mode 100755 new mode 100644 diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png old mode 100755 new mode 100644 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 -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', -- cgit v1.2.3 From de9f01ff4ab23b738d64c74e92790603f842695b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 10 Feb 2013 17:36:06 +0100 Subject: Update Debian changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cf9c12f..790575e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-django-chimere (2.0.1-1) unstable; urgency=low + + * New upstream release + + -- Étienne Loks Sun, 10 Feb 2013 17:01:34 +0100 + python-django-chimere (2.0.0-1) unstable; urgency=low * Initial release (Closes: #699579) -- cgit v1.2.3 From 0d14f906c1d8eb36127f85effb1bc87790ec251c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 12 Feb 2013 14:31:46 +0100 Subject: Debian: add missing dependency --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 0dc442c..7f913fd 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Étienne Loks Build-Depends: debhelper (>= 8.0.0), python | python-all | python-dev | python-all-dev, - python-sphinx (>= 1.0.7+dfsg) | python3-sphinx + 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 -- cgit v1.2.3 From 4a5f51d26982fe04eae01ee6ca0bbdb8b3153173 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 15 Feb 2013 12:28:33 +0100 Subject: Debian: fix dependencies --- debian/control | 3 +-- debian/pydist-overrides | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 7f913fd..71b2461 100644 --- a/debian/control +++ b/debian/control @@ -29,8 +29,7 @@ Recommends: javascript-common, libjs-jquery, libjs-jquery-ui, libjs-jquery-ui-theme-base, - gpsbabel, - tinymce + 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 diff --git a/debian/pydist-overrides b/debian/pydist-overrides index bc90d3f..0d69808 100644 --- a/debian/pydist-overrides +++ b/debian/pydist-overrides @@ -1 +1,2 @@ -django_tinymce python-django-tinymce +django_tinymce tinymce +pil python-imaging -- cgit v1.2.3