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 --- 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 ++ 35 files changed, 4 insertions(+), 17 deletions(-) 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 (limited to 'chimere') 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')) -- cgit v1.2.3